Merge branch 'release/v7.1.0'

platformio · Jul 30, 2021 · 9a08b0d · 9a08b0d
2 parents 92db3d6 + 058ae7a
commit 9a08b0d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 115 deletions.
diff --git a/builder/main.py b/builder/main.py
@@ -121,6 +121,7 @@
     else:
         target_firm = env.ElfToHex(
             join("$BUILD_DIR", "${PROGNAME}"), target_elf)
+    env.Depends(target_firm, "checkprogsize")
 
 AlwaysBuild(env.Alias("nobuild", target_firm))
 target_buildprog = env.Alias("buildprog", target_firm, target_firm)

diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nordicnrf51.git"
   },
-  "version": "7.0.0",
+  "version": "7.1.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinonordicnrf5",
@@ -58,117 +58,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-nordic": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.f0d54d8449"
-    },
-    "framework-zephyr-hal-st": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.b52fdbf4b6"
-    },
-    "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-sreccat": {
       "owner": "platformio",

diff --git a/platform.py b/platform.py
@@ -29,8 +29,7 @@ def configure_default_packages(self, variables, targets):
             self.packages["tool-nrfjprog"]["optional"] = False
         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
             self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0"
             if "windows" not in get_systype():
@@ -129,9 +128,10 @@ def _add_default_debug_tools(self, board):
 
     def configure_debug_options(self, initial_debug_options, ide_data):
         debug_options = copy.deepcopy(initial_debug_options)
-        server_executable = debug_options["server"]["executable"].lower()
         adapter_speed = initial_debug_options.get("speed")
         if adapter_speed:
+            server_options = debug_options.get("server") or {}
+            server_executable = server_options.get("executable", "").lower()
             if "openocd" in server_executable:
                 debug_options["server"]["arguments"].extend(
                     ["-c", "adapter speed %s" % adapter_speed]