Merge branch 'release/v1.2.0'

.github/workflows/examples.yml

@@ -7,27 +7,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, windows-latest, macos-latest]
-        python-version: [2.7, 3.7]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         example:
           - "examples/shakti-sdk_gpio-keypad"
           - "examples/shakti-sdk_i2c-lm75"
           - "examples/shakti-sdk_uart-hello"
           - "examples/shakti-sdk_weatherstation"
     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 }}
+          pio run -d ${{ matrix.example }}

README.md

@@ -1,16 +1,16 @@
-# Shakti: development platform for [PlatformIO](http://platformio.org)
+# Shakti: development platform for [PlatformIO](https://platformio.org)
 
 [![Build Status](https://github.com/platformio/platform-shakti/workflows/Examples/badge.svg)](https://github.com/platformio/platform-shakti/actions)
 
 Shakti is an open-source initiative by the RISE group at IIT-Madras, which is not only building open source, production grade processors, but also associated components like interconnect fabrics, verification tools, storage controllers, peripheral IPs and SOC tools.
 
-* [Home](http://platformio.org/platforms/shakti) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/page/platforms/shakti.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Home](https://registry.platformio.org/platforms/platformio/shakti) (home page in the PlatformIO Registry)
+* [Documentation](https://docs.platformio.org/page/platforms/shakti.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:
+1. [Install PlatformIO](https://platformio.org)
+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/shakti.html).
+Please navigate to [documentation](https://docs.platformio.org/page/platforms/shakti.html).

builder/frameworks/_bare.py

@@ -22,23 +22,26 @@
 
 board_config = env.BoardConfig()
 
+machine_flags = [
+    "-march=%s" % board_config.get("build.march"),
+    "-mabi=%s" % board_config.get("build.mabi"),
+    "-mcmodel=%s" % board_config.get("build.mcmodel")
+]
+
 env.Append(
-    CCFLAGS=[
+    ASFLAGS=machine_flags,
+
+    ASPPFLAGS=[
+        "-x", "assembler-with-cpp",
+    ],
+
+    CCFLAGS=machine_flags + [
         "-Wall",  # show warnings
-        "-march=%s" % board_config.get("build.march"),
-        "-mabi=%s" % board_config.get("build.mabi"),
-        "-mcmodel=%s" % board_config.get("build.mcmodel")
     ],
 
-    LINKFLAGS=[
+    LINKFLAGS=machine_flags + [
         "-nostartfiles",
-        "-march=%s" % board_config.get("build.march"),
-        "-mabi=%s" % board_config.get("build.mabi"),
-        "-mcmodel=%s" % board_config.get("build.mcmodel")
     ],
 
     LIBS=["m", "gcc"]
 )
-
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])

builder/frameworks/shakti-sdk.py

@@ -41,7 +41,7 @@ def is_valid_target(target):
 target = env.subst("$BOARD")
 
 env.Append(
-    ASFLAGS=[
+    ASPPFLAGS=[
         ("-D__ASSEMBLY__=1"),
         "-fno-common"
     ],

examples/shakti-sdk_gpio-keypad/README.md

@@ -0,0 +1,27 @@
+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-shakti/archive/develop.zip)
+3. Extract ZIP archive
+4. Run these commands:
+
+```shell
+# Change directory to example
+$ cd platform-shakti/examples/shakti-sdk_gpio-keypad
+
+# Build project
+$ pio run
+
+# Upload firmware
+$ pio run --target upload
+
+# Build specific environment
+$ pio run -e artix7_35t
+
+# Upload firmware for the specific environment
+$ pio run -e artix7_35t --target upload
+
+# Clean build files
+$ pio run --target clean
+```

examples/shakti-sdk_gpio-keypad/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
 
 [platformio]
 description =

examples/shakti-sdk_i2c-lm75/README.md

@@ -0,0 +1,27 @@
+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-shakti/archive/develop.zip)
+3. Extract ZIP archive
+4. Run these commands:
+
+```shell
+# Change directory to example
+$ cd platform-shakti/examples/shakti-sdk_i2c-lm75
+
+# Build project
+$ pio run
+
+# Upload firmware
+$ pio run --target upload
+
+# Build specific environment
+$ pio run -e artix7_35t
+
+# Upload firmware for the specific environment
+$ pio run -e artix7_35t --target upload
+
+# Clean build files
+$ pio run --target clean
+```

examples/shakti-sdk_i2c-lm75/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
 
 [platformio]
 description =