Merge branch 'release/v8.0.0'

platformio · Feb 26, 2021 · 7b55d5c · 7b55d5c
2 parents 414f322 + 99e6d02
commit 7b55d5c
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 47 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-16.04, windows-latest, macos-latest]
-        python-version: [2.7, 3.7]
+        python-version: [3.7]
         example:
           - "examples/mbed-rtos-blink-baremetal"
           - "examples/mbed-rtos-semaphore"

diff --git a/builder/main.py b/builder/main.py
@@ -167,7 +167,7 @@ def _jlink_cmd_script(env, source):
         UPLOADER="JLink.exe" if system() == "Windows" else "JLinkExe",
         UPLOADERFLAGS=[
             "-device", env.BoardConfig().get("debug", {}).get("jlink_device"),
-            "-speed", "4000",
+            "-speed", env.GetProjectOption("debug_speed", "4000"),
             "-if", ("jtag" if upload_protocol == "jlink-jtag" else "swd"),
             "-autoconnect", "1",
             "-NoGui", "1"

diff --git a/examples/zephyr-blink/src/main.c b/examples/zephyr-blink/src/main.c
@@ -9,7 +9,6 @@
 #include <devicetree.h>
 #include <drivers/gpio.h>
 
-
 /* 1000 msec = 1 sec */
 #define SLEEP_TIME_MS   1000
 
@@ -19,25 +18,20 @@
 #if DT_NODE_HAS_STATUS(LED0_NODE, okay)
 #define LED0	DT_GPIO_LABEL(LED0_NODE, gpios)
 #define PIN	DT_GPIO_PIN(LED0_NODE, gpios)
-#if DT_PHA_HAS_CELL(LED0_NODE, gpios, flags)
 #define FLAGS	DT_GPIO_FLAGS(LED0_NODE, gpios)
-#endif
 #else
 /* A build error here means your board isn't set up to blink an LED. */
 #error "Unsupported board: led0 devicetree alias is not defined"
 #define LED0	""
 #define PIN	0
-#endif
-
-#ifndef FLAGS
 #define FLAGS	0
 #endif
 
 void main(void)
 {
-	struct device *dev;
+	const struct device *dev;
 	bool led_is_on = true;
-	int ret = 0;
+	int ret;
 
 	dev = device_get_binding(LED0);
 	if (dev == NULL) {

diff --git a/examples/zephyr-sensor-vl53l0x/zephyr/prj.conf b/examples/zephyr-sensor-vl53l0x/zephyr/prj.conf
@@ -9,3 +9,4 @@ CONFIG_VL53L0X_PROXIMITY_THRESHOLD=100
 #CONFIG_DEBUG=y
 #CONFIG_LOG=y
 #CONFIG_SENSOR_LOG_LEVEL_DBG=y
+CONFIG_CBPRINTF_FP_SUPPORT=y
diff --git a/platform.json b/platform.json
@@ -5,12 +5,12 @@
   "homepage": "http://www.silabs.com/products/mcu/32-bit/efm32-gecko/Pages/efm32-gecko.aspx",
   "license": "Apache-2.0",
   "keywords": [
-      "dev-platform",
-      "ARM",
-      "Cortex-M",
-      "Silicon Labs",
-      "EFM32",
-      "Gecko"
+    "dev-platform",
+    "ARM",
+    "Cortex-M",
+    "Silicon Labs",
+    "EFM32",
+    "Gecko"
   ],
   "engines": {
     "platformio": "^5"
@@ -19,7 +19,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-siliconlabsefm32.git"
   },
-  "version": "7.0.0",
+  "version": "8.0.0",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",
@@ -34,89 +34,85 @@
     "toolchain-gccarmnoneeabi": {
       "type": "toolchain",
       "owner": "platformio",
-      "version": "~1.80201.0"
+      "version": "~1.80201.0",
+      "optionalVersions": [
+        "~1.90201.0"
+      ]
     },
     "framework-mbed": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~6.60600.0"
+      "version": "~6.60600.0",
+      "optionalVersions": [
+        "~6.51506.0"
+      ]
     },
     "framework-zephyr": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.20400.0"
+      "version": "~2.20500.0"
     },
     "framework-zephyr-canopennode": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.5c6b0566d5"
+      "version": "0.0.0-alpha+sha.468d350028"
     },
     "framework-zephyr-civetweb": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.99129c5efc"
+      "version": "0.0.0-alpha+sha.e6903b80c0"
     },
     "framework-zephyr-cmsis": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.542b2296e6"
-    },
-    "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.99129c5efc"
+      "version": "0.0.0-alpha+sha.c3bd2094f9"
     },
     "framework-zephyr-fatfs": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.13697783bf"
+      "version": "0.0.0-alpha+sha.1d1fcc725a"
     },
     "framework-zephyr-hal-silabs": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.69c3e1e6e1"
+      "version": "0.0.0-alpha+sha.6bb4a17a2f"
     },
     "framework-zephyr-hal-st": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.5b3ec3e182"
+      "version": "0.0.0-alpha+sha.b52fdbf4b6"
     },
     "framework-zephyr-libmetal": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.0b23894a04"
+      "version": "0.0.0-alpha+sha.9d4ee2c3cf"
     },
     "framework-zephyr-lvgl": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.928b61c7c8"
+      "version": "0.0.0-alpha+sha.31acbaa36e"
     },
     "framework-zephyr-mbedtls": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.aef137b1af"
+      "version": "0.0.0-alpha+sha.24d84ecff1"
     },
     "framework-zephyr-mcuboot": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.a5d79cf8cc"
+      "version": "0.0.0-alpha+sha.3fc59410b6"
     },
     "framework-zephyr-mcumgr": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.5051f9d900"
+      "version": "0.0.0-alpha+sha.43845e883f"
     },
     "framework-zephyr-open-amp": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.724f7e2a45"
+      "version": "0.0.0-alpha+sha.de1b85a130"
     },
     "framework-zephyr-loramac-node": {
       "optional": true,
@@ -126,12 +122,17 @@
     "framework-zephyr-openthread": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.07f430dac6"
+      "version": "0.0.0-alpha+sha.1d668284a0"
     },
     "framework-zephyr-segger": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.874d9e9696"
+      "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,
@@ -151,12 +152,17 @@
     "framework-zephyr-mipi-sys-t": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.957d46bc3c"
+      "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.143df67555"
+      "version": "0.0.0-alpha+sha.96340fb6c0"
     },
     "tool-jlink": {
       "type": "uploader",

diff --git a/platform.py b/platform.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import copy
 import json
 import os
 
@@ -41,7 +42,6 @@ def configure_default_packages(self, variables, targets):
                 if p.startswith("framework-zephyr-") or 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():
                 self.packages["tool-gperf"]["optional"] = False
 
@@ -96,3 +96,15 @@ def _add_default_debug_tools(self, board):
 
         board.manifest["debug"] = debug
         return 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:
+            if "jlink" in server_executable:
+                debug_options["server"]["arguments"].extend(
+                    ["-speed", adapter_speed]
+                )
+
+        return debug_options