Merge branch 'release/v8.2.0'

Author: valeros

.github/workflows/examples.yml

@@ -21,10 +21,6 @@ jobs:
           - "examples/zephyr-blink"
           - "examples/zephyr-custom-board"
           - "examples/zephyr-synchronization"
-        exclude:
-          - {python-version: 2.7, example: "examples/zephyr-blink"}
-          - {python-version: 2.7, example: "examples/zephyr-custom-board"}
-          - {python-version: 2.7, example: "examples/zephyr-synchronization"}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

boards/lpcxpresso55s16.json

@@ -2,10 +2,7 @@
   "build": {
     "cpu": "cortex-m33",
     "f_cpu": "150000000L",
-    "mcu": "lpc55s16",
-    "zephyr": {
-      "variant": "lpcxpresso55s16_ns"
-    }
+    "mcu": "lpc55s16"
   },
   "connectivity": [
     "ethernet"

builder/main.py

@@ -15,11 +15,30 @@
 import sys
 from platform import system
 from os import makedirs
-from os.path import isdir, join
+from os.path import isdir, isfile, join
+from struct import unpack, pack
 
 from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
                           Builder, Default, DefaultEnvironment)
 
+
+def add_image_checksum(source, target, env):
+    # According to https://community.nxp.com/t5/LPCXpresso-IDE-FAQs/LPC-Image-Checksums/m-p/471035
+    # NXP LPC parts use a word in the vector table of the processor to store a checksum
+    # that is examined by the bootloader to identify a valid image.
+    bin_path = target[0].path
+    if isfile(bin_path):
+        # From https://github.com/ARMmbed/mbed-os/blob/master/tools/targets/LPC.py
+        with open(bin_path, "r+b") as fp:
+            # Read entries 0 through 6 (Little Endian 32bits words)
+            vector = [unpack("<I", fp.read(4))[0] for _ in range(7)]
+
+            # location 7 (offset 0x1C in the vector table) should contain the 2"s
+            # complement of the check-sum of table entries 0 through 6
+            fp.seek(0x1C)
+            fp.write(pack("<I", (~sum(vector) + 1) & 0xFFFFFFFF))
+
+
 env = DefaultEnvironment()
 env.SConscript("compat.py", exports="env")
 platform = env.PioPlatform()
@@ -97,6 +116,8 @@
 else:
     target_elf = env.BuildProgram()
     target_firm = env.ElfToBin(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
+    env.AddPostAction(target_firm, env.VerboseAction(
+        add_image_checksum, "Adding checksum to $TARGET"))
     env.Depends(target_firm, "checkprogsize")
 
 AlwaysBuild(env.Alias("nobuild", target_firm))

examples/zephyr-custom-board/boards/my_custom_board.json

@@ -4,7 +4,7 @@
     "f_cpu": "150000000L",
     "mcu": "lpc55s16",
     "zephyr": {
-      "variant": "lpcxpresso55s16_ns"
+      "variant": "lpcxpresso55s16"
     }
   },
   "connectivity": [

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nxplpc.git"
   },
-  "version": "8.1.0",
+  "version": "8.2.0",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",
@@ -51,117 +51,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.20500.0"
-    },
-    "framework-zephyr-cmsis": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.c3bd2094f9"
-    },
-    "framework-zephyr-canopennode": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.468d350028"
-    },
-    "framework-zephyr-civetweb": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.e6903b80c0"
-    },
-    "framework-zephyr-fatfs": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.1d1fcc725a"
-    },
-    "framework-zephyr-hal-st": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.b52fdbf4b6"
-    },
-    "framework-zephyr-hal-nxp": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.b916bca1d5"
-    },
-    "framework-zephyr-libmetal": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.9d4ee2c3cf"
-    },
-    "framework-zephyr-lvgl": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.31acbaa36e"
-    },
-    "framework-zephyr-mbedtls": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.24d84ecff1"
-    },
-    "framework-zephyr-mcuboot": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.3fc59410b6"
-    },
-    "framework-zephyr-mcumgr": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.43845e883f"
-    },
-    "framework-zephyr-open-amp": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.de1b85a130"
-    },
-    "framework-zephyr-loramac-node": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.3f545d76a2"
-    },
-    "framework-zephyr-openthread": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.1d668284a0"
-    },
-    "framework-zephyr-segger": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.38c79a447e"
-    },
-    "framework-zephyr-sof": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.b5b772dd61"
-    },
-    "framework-zephyr-tinycbor": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.40daca97b4"
-    },
-    "framework-zephyr-tinycrypt": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.3e9a49d267"
-    },
-    "framework-zephyr-littlefs": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.9e4498d1c7"
-    },
-    "framework-zephyr-mipi-sys-t": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.75e671550a"
-    },
-    "framework-zephyr-tfm-mcuboot": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "1.7.0-rc1"
-    },
-    "framework-zephyr-trusted-firmware-m": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.96340fb6c0"
+      "version": "~2.20600.0"
     },
     "tool-openocd": {
       "type": "debugger",

platform.py

@@ -45,8 +45,7 @@ def configure_default_packages(self, variables, targets):
 
         if "zephyr" in variables.get("pioframework", []):
             for p in self.packages:
-                if p.startswith("framework-zephyr-") or p in (
-                    "tool-cmake", "tool-dtc", "tool-ninja"):
+                if p in ("tool-cmake", "tool-dtc", "tool-ninja"):
                     self.packages[p]["optional"] = False
             if "windows" not in get_systype():
                 self.packages["tool-gperf"]["optional"] = False