Merge branch 'release/v6.0.0'

platformio · Nov 11, 2020 · f81afa9 · f81afa9
2 parents adeb6eb + ed98565
commit f81afa9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/boards/lpc11u68.json b/boards/lpc11u68.json
@@ -2,15 +2,19 @@
   "build": {
     "cpu": "cortex-m0plus",
     "f_cpu": "50000000L",
-    "mcu": "lpc11u68"
+    "mcu": "lpc11u68",
+    "zephyr": {
+       "variant": "lpcxpresso11u68"
+    }
   },
   "debug": {
     "jlink_device": "LPC11U68",
     "openocd_target": "lpc11xx",
     "svd_path": "LPC11Uxx_v7.svd"
   },
   "frameworks": [
-    "mbed"
+    "mbed",
+    "zephyr"
   ],
   "name": "LPCXpresso11U68",
   "upload": {
@@ -24,6 +28,6 @@
       "mbed"
     ]
   },
-  "url": "https://developer.mbed.org/platforms/LPCXpresso11U68/",
+  "url": "https://www.nxp.com/design/microcontrollers-developer-resources/lpc-microcontroller-utilities/lpcxpresso-board-for-lpc11u68:OM13058",
   "vendor": "NXP"
 }
diff --git a/examples/zephyr-synchronization/src/main.c b/examples/zephyr-synchronization/src/main.c
@@ -43,12 +43,12 @@ void helloLoop(const char *my_name,
 
 		/* say "hello" */
 		tname = k_thread_name_get(k_current_get());
-		if (tname == NULL) {
+		if (tname != NULL && tname[0] != '\0') {
 			printk("%s: Hello World from %s!\n",
-				my_name, CONFIG_BOARD);
+				tname, CONFIG_BOARD);
 		} else {
 			printk("%s: Hello World from %s!\n",
-				tname, CONFIG_BOARD);
+				my_name, CONFIG_BOARD);
 		}
 
 		/* wait a while, then let other thread have a turn */

diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nxplpc.git"
   },
-  "version": "5.3.1",
+  "version": "6.0.0",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",
@@ -45,57 +45,62 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.20300.0"
+      "version": "~2.20400.0"
+    },
+    "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.5c6b0566d5"
+      "version": "0.0.0-alpha+sha.468d350028"
     },
     "framework-zephyr-civetweb": {
       "optional": true,
       "owner": "platformio",
       "version": "0.0.0-alpha+sha.99129c5efc"
     },
-    "framework-zephyr-cmsis": {
+    "framework-zephyr-fatfs": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.542b2296e6"
+      "version": "0.0.0-alpha+sha.13697783bf"
     },
-    "framework-zephyr-fatfs": {
+    "framework-zephyr-hal-st": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.9ee6b9b951"
+      "version": "0.0.0-alpha+sha.5b3ec3e182"
     },
     "framework-zephyr-hal-nxp": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.80a337dc4c"
+      "version": "0.0.0-alpha+sha.68bbdbdec1"
     },
     "framework-zephyr-libmetal": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.3c3c9ec83b"
+      "version": "0.0.0-alpha+sha.0b23894a04"
     },
     "framework-zephyr-lvgl": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.74fc2e753a"
+      "version": "0.0.0-alpha+sha.928b61c7c8"
     },
     "framework-zephyr-mbedtls": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.4bf099f125"
+      "version": "0.0.0-alpha+sha.aef137b1af"
     },
     "framework-zephyr-mcuboot": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.e88113bbeb"
+      "version": "0.0.0-alpha+sha.a5d79cf8cc"
     },
     "framework-zephyr-mcumgr": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.5885efb7ca"
+      "version": "0.0.0-alpha+sha.5051f9d900"
     },
     "framework-zephyr-open-amp": {
       "optional": true,
@@ -105,17 +110,17 @@
     "framework-zephyr-loramac-node": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.29e516ec58"
+      "version": "0.0.0-alpha+sha.3f545d76a2"
     },
     "framework-zephyr-openthread": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.a83d18cf18"
+      "version": "0.0.0-alpha+sha.07f430dac6"
     },
     "framework-zephyr-segger": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.6fcf61606d"
+      "version": "0.0.0-alpha+sha.874d9e9696"
     },
     "framework-zephyr-tinycbor": {
       "optional": true,
@@ -130,7 +135,7 @@
     "framework-zephyr-littlefs": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.0aefdda69d"
+      "version": "0.0.0-alpha+sha.9e4498d1c7"
     },
     "framework-zephyr-mipi-sys-t": {
       "optional": true,
@@ -140,7 +145,7 @@
     "framework-zephyr-trusted-firmware-m": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.7de2daa196"
+      "version": "0.0.0-alpha+sha.143df67555"
     },
     "tool-openocd": {
       "type": "debugger",