Merge branch 'release/v5.2.0'

platformio · May 30, 2022 · 13c9c5a · 13c9c5a
2 parents 15c40d0 + 3f70194
commit 13c9c5a
Show file tree

Hide file tree

Showing 22 changed files with 63 additions and 442 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -7,31 +7,26 @@ 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/mbed-rtos-blink-baremetal"
           - "examples/mbed-rtos-cellular"
           - "examples/mbed-rtos-ethernet-tls"
           - "examples/zephyr-blink"
           - "examples/zephyr-synchronization"
-        exclude:
-          - {python-version: 2.7, example: "examples/zephyr-blink"}
-          - {python-version: 2.7, example: "examples/zephyr-synchronization"}
     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 }}
diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@
 
 The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price. Combining high performance with real-time functionality, the i.MX RT series of crossover processors are designed to support next-generation IoT applications with a high level of integration and security balanced with MCU-level usability.
 
-* [Home](http://platformio.org/platforms/nxpimxrt) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/page/platforms/nxpimxrt.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Home](https://registry.platformio.org/platforms/platformio/nxpimxrt) (home page in the PlatformIO Registry)
+* [Documentation](https://docs.platformio.org/page/platforms/nxpimxrt.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/nxpimxrt.html).
+Please navigate to [documentation](https://docs.platformio.org/page/platforms/nxpimxrt.html).
diff --git a/builder/compat.py b/builder/compat.py
diff --git a/builder/frameworks/_bare.py b/builder/frameworks/_bare.py
@@ -1,4 +1,4 @@
-# Copyright 2020-present PlatformIO <[email protected]>
+# Copyright 2014-present PlatformIO <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,12 @@
 env = DefaultEnvironment()
 
 env.Append(
-    ASFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=[
+        "-mthumb",
+    ],
+    ASPPFLAGS=[
+        "-x", "assembler-with-cpp",
+    ],
 
     CCFLAGS=[
         "-Os",  # optimize for size
@@ -54,13 +59,13 @@
 
 if "BOARD" in env:
     env.Append(
+        ASFLAGS=[
+            "-mcpu=%s" % env.BoardConfig().get("build.cpu")
+        ],
         CCFLAGS=[
             "-mcpu=%s" % env.BoardConfig().get("build.cpu")
         ],
         LINKFLAGS=[
             "-mcpu=%s" % env.BoardConfig().get("build.cpu")
         ]
     )
-
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
diff --git a/builder/main.py b/builder/main.py
@@ -21,7 +21,6 @@
                           Builder, Default, DefaultEnvironment)
 
 env = DefaultEnvironment()
-env.SConscript("compat.py", exports="env")
 platform = env.PioPlatform()
 board = env.BoardConfig()
 

diff --git a/examples/mbed-rtos-blink-baremetal/.travis.yml b/examples/mbed-rtos-blink-baremetal/.travis.yml
diff --git a/examples/mbed-rtos-blink-baremetal/README.md b/examples/mbed-rtos-blink-baremetal/README.md
@@ -1,7 +1,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
 2. Download [development platform with examples](https://github.com/platformio/platform-nxpimxrt/archive/develop.zip)
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/mbed-rtos-blink-baremetal/platformio.ini b/examples/mbed-rtos-blink-baremetal/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:mimxrt1050_evk]
 platform = nxpimxrt

diff --git a/examples/mbed-rtos-cellular/.travis.yml b/examples/mbed-rtos-cellular/.travis.yml
diff --git a/examples/mbed-rtos-cellular/README.md b/examples/mbed-rtos-cellular/README.md
@@ -1,7 +1,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
 2. Download [development platform with examples](https://github.com/platformio/platform-nxpimxrt/archive/develop.zip)
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/mbed-rtos-cellular/platformio.ini b/examples/mbed-rtos-cellular/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:mimxrt1050_evk]
 platform = nxpimxrt

diff --git a/examples/mbed-rtos-ethernet-tls/.travis.yml b/examples/mbed-rtos-ethernet-tls/.travis.yml
diff --git a/examples/mbed-rtos-ethernet-tls/README.md b/examples/mbed-rtos-ethernet-tls/README.md
@@ -1,7 +1,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
 2. Download [development platform with examples](https://github.com/platformio/platform-nxpimxrt/archive/develop.zip)
 3. Extract ZIP archive
 4. Run these commands: