Merge branch 'release/v6.0.0'

Author: valeros

examples/zephyr-net-telnet/src/telnet.c

@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
-				  u32_t mgmt_event,
+				  uint32_t mgmt_event,
 				  struct net_if *iface)
 {
 	char hr_addr[NET_IPV4_ADDR_LEN];

examples/zephyr-sensor-sx9500/src/main.c

@@ -11,7 +11,8 @@
 #include <sys/printk.h>
 #ifdef CONFIG_SX9500_TRIGGER
 
-static void sensor_trigger_handler(struct device *dev, struct sensor_trigger *trig)
+static void sensor_trigger_handler(const struct device *dev,
+				   struct sensor_trigger *trig)
 {
 	struct sensor_value prox_value;
 	int ret;
@@ -26,7 +27,7 @@ static void sensor_trigger_handler(struct device *dev, struct sensor_trigger *tr
 	printk("prox is %d\n", prox_value.val1);
 }
 
-static void setup_trigger(struct device *dev)
+static void setup_trigger(const struct device *dev)
 {
 	int ret;
 	struct sensor_trigger trig = {
@@ -39,18 +40,18 @@ static void setup_trigger(struct device *dev)
 	}
 }
 
-void do_main(struct device *dev)
+void do_main(const struct device *dev)
 {
 	setup_trigger(dev);
 
 	while (1) {
-		k_sleep(1000);
+		k_sleep(K_MSEC(1000));
 	}
 }
 
 #else /* CONFIG_SX9500_TRIGGER */
 
-static void do_main(struct device *dev)
+static void do_main(const struct device *dev)
 {
 	int ret;
 	struct sensor_value prox_value;
@@ -65,15 +66,15 @@ static void do_main(struct device *dev)
 		ret = sensor_channel_get(dev, SENSOR_CHAN_PROX, &prox_value);
 		printk("prox is %d\n", prox_value.val1);
 
-		k_sleep(1000);
+		k_sleep(K_MSEC(1000));
 	}
 }
 
 #endif /* CONFIG_SX9500_TRIGGER */
 
 void main(void)
 {
-	struct device *dev;
+	const struct device *dev;
 
 	dev = device_get_binding("SX9500");
 
@@ -82,7 +83,7 @@ void main(void)
 		return;
 	}
 
-	printk("device is %p, name is %s\n", dev, dev->config->name);
+	printk("device is %p, name is %s\n", dev, dev->name);
 
 	do_main(dev);
 }

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-freescalekinetis.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-nxp": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.9ee6b9b951"
+      "version": "0.0.0-alpha+sha.68bbdbdec1"
     },
-    "framework-zephyr-hal-nxp": {
+    "framework-zephyr-hal-st": {
       "optional": true,
       "owner": "platformio",
-      "version": "0.0.0-alpha+sha.80a337dc4c"
+      "version": "0.0.0-alpha+sha.5b3ec3e182"
     },
     "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-pyocd": {
       "type": "uploader",