Merge branch 'release/v1.2.0'

.github/workflows/examples.yml

@@ -7,8 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
-        python-version: [3.7]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         example:
           - "examples/native-asm"
           - "examples/native-bare_c"
@@ -17,18 +16,17 @@ jobs:
           # - "examples/zephyr-hello-world"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: "recursive"
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - name: Set up Python
+        uses: actions/setup-python@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.9"
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
           pip install -U https://github.com/platformio/platformio/archive/develop.zip
-          platformio platform install file://.
+          pio pkg install --global --platform symlink://.
       - name: Build examples
         run: |
           platformio run -d ${{ matrix.example }}

README.md

@@ -4,13 +4,13 @@
 
 CHIPS Alliance brings the power of open source and software automation to the semiconductor industry, making it possible to develop new hardware faster and more affordably than ever before.
 
-* [Home](http://platformio.org/platforms/chipsalliance) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/page/platforms/chipsalliance.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Home](https://registry.platformio.org/platforms/platformio/chipsalliance) (home page in the PlatformIO Registry)
+* [Documentation](https://docs.platformio.org/page/platforms/chipsalliance.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
 1. [Install PlatformIO](http://platformio.org)
-2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file:
+2. Create PlatformIO project and configure a platform option in [platformio.ini](https://docs.platformio.org/page/projectconf.html) file:
 
 ## Stable version
 
@@ -32,4 +32,4 @@ board = ...
 
 # Configuration
 
-Please navigate to [documentation](http://docs.platformio.org/page/platforms/chipsalliance.html).
+Please navigate to [documentation](https://docs.platformio.org/page/platforms/chipsalliance.html).

builder/frameworks/_bare.py

@@ -8,8 +8,11 @@
 
 env.Append(
     ASFLAGS=[
+        "-march=%s" % board.get("build.march"),
+        "-mabi=%s" % board.get("build.mabi"),
+    ],
+    ASPPFLAGS=[
         "-x", "assembler-with-cpp",
-        "-Wa,-march=%s" % board.get("build.march")
     ],
 
     CCFLAGS=[
@@ -56,10 +59,3 @@
         "-Wl,--defsym=__comrv_cache_size=0",
     ]
 )
-
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
-
-#
-# Target: Build libraries
-#

builder/main.py

@@ -90,7 +90,6 @@ def run_verilator(target, source, env):
 
 
 env = DefaultEnvironment()
-env.SConscript("compat.py", exports="env")
 platform = env.PioPlatform()
 board_config = env.BoardConfig()
 

examples/native-asm/README.md

@@ -0,0 +1,36 @@
+How to build PlatformIO based project
+=====================================
+
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
+2. Download [development platform with examples](https://github.com/platformio/platform-chipsalliance/archive/develop.zip)
+3. Extract ZIP archive
+4. Run these commands:
+
+```shell
+# Change directory to example
+$ cd platform-chipsalliance/examples/native-blink_asm
+
+# Build project
+$ pio run
+
+# Upload firmware
+$ pio run --target upload
+
+# Upload bitstream
+$ pio run --target program_fpga
+
+# Generate trace for GTKWave
+$ pio run --target generate_trace
+
+# Start verilator as JTAG server for OpenOCD
+$ pio run --target start_verilator
+
+# Generate bistream for SweRV Core using Xilinx Vivado
+$ pio run --target generate_bitstream
+
+# Upload firmware for the specific environment
+$ pio run -e swervolf_nexys --target upload
+
+# Clean build files
+$ pio run --target clean
+```

examples/native-asm/platformio.ini

@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/page/projectconf.html
+; https://docs.platformio.org/page/projectconf.html
 
 [env:rvfpga]
 platform = chipsalliance

examples/native-asm/src/main.s

@@ -0,0 +1,13 @@
+.globl _start
+_start:
+
+next:
+    li  a1, 0x80001012         # Read the Switches
+    lw  t0, 0(a1)
+
+    li  a0, 0x80001010        # Write the LEDs
+    sw  t0, 0(a0)
+
+    beq zero, zero, next     # infinite loop
+
+.end