Skip to content

Commit cad6d37

Browse files
committed
Update Zephyr to v2.4.0
1 parent 9cb596a commit cad6d37

File tree

3 files changed

+32
-23
lines changed

3 files changed

+32
-23
lines changed

boards/lpc11u68.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
"build": {
33
"cpu": "cortex-m0plus",
44
"f_cpu": "50000000L",
5-
"mcu": "lpc11u68"
5+
"mcu": "lpc11u68",
6+
"zephyr": {
7+
"variant": "lpcxpresso11u68"
8+
}
69
},
710
"debug": {
811
"jlink_device": "LPC11U68",
912
"openocd_target": "lpc11xx",
1013
"svd_path": "LPC11Uxx_v7.svd"
1114
},
1215
"frameworks": [
13-
"mbed"
16+
"mbed",
17+
"zephyr"
1418
],
1519
"name": "LPCXpresso11U68",
1620
"upload": {
@@ -24,6 +28,6 @@
2428
"mbed"
2529
]
2630
},
27-
"url": "https://developer.mbed.org/platforms/LPCXpresso11U68/",
31+
"url": "https://www.nxp.com/design/microcontrollers-developer-resources/lpc-microcontroller-utilities/lpcxpresso-board-for-lpc11u68:OM13058",
2832
"vendor": "NXP"
2933
}

examples/zephyr-synchronization/src/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ void helloLoop(const char *my_name,
4343

4444
/* say "hello" */
4545
tname = k_thread_name_get(k_current_get());
46-
if (tname == NULL) {
46+
if (tname != NULL && tname[0] != '\0') {
4747
printk("%s: Hello World from %s!\n",
48-
my_name, CONFIG_BOARD);
48+
tname, CONFIG_BOARD);
4949
} else {
5050
printk("%s: Hello World from %s!\n",
51-
tname, CONFIG_BOARD);
51+
my_name, CONFIG_BOARD);
5252
}
5353

5454
/* wait a while, then let other thread have a turn */

platform.json

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,57 +45,62 @@
4545
"type": "framework",
4646
"optional": true,
4747
"owner": "platformio",
48-
"version": "~2.20300.0"
48+
"version": "~2.20400.0"
49+
},
50+
"framework-zephyr-cmsis": {
51+
"optional": true,
52+
"owner": "platformio",
53+
"version": "0.0.0-alpha+sha.542b2296e6"
4954
},
5055
"framework-zephyr-canopennode": {
5156
"optional": true,
5257
"owner": "platformio",
53-
"version": "0.0.0-alpha+sha.5c6b0566d5"
58+
"version": "0.0.0-alpha+sha.468d350028"
5459
},
5560
"framework-zephyr-civetweb": {
5661
"optional": true,
5762
"owner": "platformio",
5863
"version": "0.0.0-alpha+sha.99129c5efc"
5964
},
60-
"framework-zephyr-cmsis": {
65+
"framework-zephyr-fatfs": {
6166
"optional": true,
6267
"owner": "platformio",
63-
"version": "0.0.0-alpha+sha.542b2296e6"
68+
"version": "0.0.0-alpha+sha.13697783bf"
6469
},
65-
"framework-zephyr-fatfs": {
70+
"framework-zephyr-hal-st": {
6671
"optional": true,
6772
"owner": "platformio",
68-
"version": "0.0.0-alpha+sha.9ee6b9b951"
73+
"version": "0.0.0-alpha+sha.5b3ec3e182"
6974
},
7075
"framework-zephyr-hal-nxp": {
7176
"optional": true,
7277
"owner": "platformio",
73-
"version": "0.0.0-alpha+sha.80a337dc4c"
78+
"version": "0.0.0-alpha+sha.68bbdbdec1"
7479
},
7580
"framework-zephyr-libmetal": {
7681
"optional": true,
7782
"owner": "platformio",
78-
"version": "0.0.0-alpha+sha.3c3c9ec83b"
83+
"version": "0.0.0-alpha+sha.0b23894a04"
7984
},
8085
"framework-zephyr-lvgl": {
8186
"optional": true,
8287
"owner": "platformio",
83-
"version": "0.0.0-alpha+sha.74fc2e753a"
88+
"version": "0.0.0-alpha+sha.928b61c7c8"
8489
},
8590
"framework-zephyr-mbedtls": {
8691
"optional": true,
8792
"owner": "platformio",
88-
"version": "0.0.0-alpha+sha.4bf099f125"
93+
"version": "0.0.0-alpha+sha.aef137b1af"
8994
},
9095
"framework-zephyr-mcuboot": {
9196
"optional": true,
9297
"owner": "platformio",
93-
"version": "0.0.0-alpha+sha.e88113bbeb"
98+
"version": "0.0.0-alpha+sha.a5d79cf8cc"
9499
},
95100
"framework-zephyr-mcumgr": {
96101
"optional": true,
97102
"owner": "platformio",
98-
"version": "0.0.0-alpha+sha.5885efb7ca"
103+
"version": "0.0.0-alpha+sha.5051f9d900"
99104
},
100105
"framework-zephyr-open-amp": {
101106
"optional": true,
@@ -105,17 +110,17 @@
105110
"framework-zephyr-loramac-node": {
106111
"optional": true,
107112
"owner": "platformio",
108-
"version": "0.0.0-alpha+sha.29e516ec58"
113+
"version": "0.0.0-alpha+sha.3f545d76a2"
109114
},
110115
"framework-zephyr-openthread": {
111116
"optional": true,
112117
"owner": "platformio",
113-
"version": "0.0.0-alpha+sha.a83d18cf18"
118+
"version": "0.0.0-alpha+sha.07f430dac6"
114119
},
115120
"framework-zephyr-segger": {
116121
"optional": true,
117122
"owner": "platformio",
118-
"version": "0.0.0-alpha+sha.6fcf61606d"
123+
"version": "0.0.0-alpha+sha.874d9e9696"
119124
},
120125
"framework-zephyr-tinycbor": {
121126
"optional": true,
@@ -130,7 +135,7 @@
130135
"framework-zephyr-littlefs": {
131136
"optional": true,
132137
"owner": "platformio",
133-
"version": "0.0.0-alpha+sha.0aefdda69d"
138+
"version": "0.0.0-alpha+sha.9e4498d1c7"
134139
},
135140
"framework-zephyr-mipi-sys-t": {
136141
"optional": true,
@@ -140,7 +145,7 @@
140145
"framework-zephyr-trusted-firmware-m": {
141146
"optional": true,
142147
"owner": "platformio",
143-
"version": "0.0.0-alpha+sha.7de2daa196"
148+
"version": "0.0.0-alpha+sha.143df67555"
144149
},
145150
"tool-openocd": {
146151
"type": "debugger",

0 commit comments

Comments
 (0)