Skip to content

Commit 896151f

Browse files
committed
Initial support for Zephyr 2.6.0
1 parent f702b3f commit 896151f

File tree

8 files changed

+100
-120
lines changed

8 files changed

+100
-120
lines changed

boards/disco_g071rb.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"build": {
3+
"core": "stm32",
4+
"cpu": "cortex-m0plus",
5+
"extra_flags": "-DSTM32G0xx -DSTM32G071xx",
6+
"f_cpu": "64000000L",
7+
"mcu": "stm32g071rbt6",
8+
"product_line": "STM32G071xx",
9+
"zephyr": {
10+
"variant": "stm32g071b_disco"
11+
}
12+
},
13+
"debug": {
14+
"default_tools": [
15+
"stlink"
16+
],
17+
"jlink_device": "STM32G071RB",
18+
"onboard_tools": [
19+
"stlink"
20+
],
21+
"openocd_target": "stm32g0x",
22+
"svd_path": "STM32G071.svd"
23+
},
24+
"frameworks": [
25+
"cmsis",
26+
"libopencm3",
27+
"stm32cube",
28+
"zephyr"
29+
],
30+
"name": "ST STM32G071B Discovery",
31+
"upload": {
32+
"maximum_ram_size": 36864,
33+
"maximum_size": 131072,
34+
"protocol": "stlink",
35+
"protocols": [
36+
"stlink",
37+
"jlink",
38+
"cmsis-dap",
39+
"blackmagic",
40+
"mbed"
41+
]
42+
},
43+
"url": "https://www.st.com/en/evaluation-tools/stm32g071b-disco.html",
44+
"vendor": "ST"
45+
}

boards/nucleo_f031k6.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"cmsis",
2626
"mbed",
2727
"stm32cube",
28-
"libopencm3"
28+
"libopencm3",
29+
"zephyr"
2930
],
3031
"name": "ST Nucleo F031K6",
3132
"upload": {

boards/nucleo_h753zi.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"build": {
3+
"core": "stm32",
4+
"cpu": "cortex-m7",
5+
"extra_flags": "-DSTM32H7xx -DSTM32H753xx",
6+
"f_cpu": "400000000L",
7+
"mcu": "stm32h753zit6",
8+
"product_line": "STM32H753xx"
9+
},
10+
"connectivity": [
11+
"can",
12+
"ethernet"
13+
],
14+
"debug": {
15+
"default_tools": [
16+
"stlink"
17+
],
18+
"jlink_device": "STM32H753ZI",
19+
"onboard_tools": [
20+
"stlink"
21+
],
22+
"openocd_target": "stm32h7x",
23+
"svd_path": "STM32H753.svd"
24+
},
25+
"frameworks": [
26+
"cmsis",
27+
"stm32cube",
28+
"zephyr"
29+
],
30+
"name": "ST Nucleo H753ZI",
31+
"upload": {
32+
"maximum_ram_size": 884736,
33+
"maximum_size": 2097152,
34+
"protocol": "stlink",
35+
"protocols": [
36+
"jlink",
37+
"cmsis-dap",
38+
"stlink",
39+
"blackmagic",
40+
"mbed"
41+
]
42+
},
43+
"url": "https://www.st.com/en/evaluation-tools/nucleo-h753zi.html",
44+
"vendor": "ST"
45+
}

boards/nucleo_l412rb_p.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
},
2121
"frameworks": [
2222
"cmsis",
23-
"stm32cube"
23+
"stm32cube",
24+
"zephyr"
2425
],
2526
"name": "ST Nucleo L412RB-P",
2627
"upload": {

examples/zephyr-net-civetweb/src/libc_extensions.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,6 @@ long long strtoll(const char *str, char **endptr, int base)
159159
return (long long)strtol(str, endptr, base);
160160
}
161161

162-
time_t time(time_t *t)
163-
{
164-
return 0;
165-
}
166-
167162
/*
168163
* Most of the wrappers below are copies of the wrappers in net/sockets.h,
169164
* but they are available only if CONFIG_NET_SOCKETS_POSIX_NAMES is enabled

examples/zephyr-net-civetweb/zephyr/prj.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
3030

3131
# logging
3232
CONFIG_NET_LOG=y
33+
34+
# Do not include mbedtls via this option as civetweb does not
35+
# work properly with mbedtls.
36+
CONFIG_NET_TCP_ISN_RFC6528=n

platform.json

Lines changed: 1 addition & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -300,117 +300,7 @@
300300
"type": "framework",
301301
"optional": true,
302302
"owner": "platformio",
303-
"version": "~2.20500.0"
304-
},
305-
"framework-zephyr-cmsis": {
306-
"optional": true,
307-
"owner": "platformio",
308-
"version": "0.0.0-alpha+sha.c3bd2094f9"
309-
},
310-
"framework-zephyr-canopennode": {
311-
"optional": true,
312-
"owner": "platformio",
313-
"version": "0.0.0-alpha+sha.468d350028"
314-
},
315-
"framework-zephyr-civetweb": {
316-
"optional": true,
317-
"owner": "platformio",
318-
"version": "0.0.0-alpha+sha.e6903b80c0"
319-
},
320-
"framework-zephyr-fatfs": {
321-
"optional": true,
322-
"owner": "platformio",
323-
"version": "0.0.0-alpha+sha.1d1fcc725a"
324-
},
325-
"framework-zephyr-hal-st": {
326-
"optional": true,
327-
"owner": "platformio",
328-
"version": "0.0.0-alpha+sha.b52fdbf4b6"
329-
},
330-
"framework-zephyr-hal-stm32": {
331-
"optional": true,
332-
"owner": "platformio",
333-
"version": "0.0.0-alpha+sha.cc8731dba4"
334-
},
335-
"framework-zephyr-libmetal": {
336-
"optional": true,
337-
"owner": "platformio",
338-
"version": "0.0.0-alpha+sha.9d4ee2c3cf"
339-
},
340-
"framework-zephyr-lvgl": {
341-
"optional": true,
342-
"owner": "platformio",
343-
"version": "0.0.0-alpha+sha.31acbaa36e"
344-
},
345-
"framework-zephyr-mbedtls": {
346-
"optional": true,
347-
"owner": "platformio",
348-
"version": "0.0.0-alpha+sha.24d84ecff1"
349-
},
350-
"framework-zephyr-mcuboot": {
351-
"optional": true,
352-
"owner": "platformio",
353-
"version": "0.0.0-alpha+sha.3fc59410b6"
354-
},
355-
"framework-zephyr-mcumgr": {
356-
"optional": true,
357-
"owner": "platformio",
358-
"version": "0.0.0-alpha+sha.43845e883f"
359-
},
360-
"framework-zephyr-open-amp": {
361-
"optional": true,
362-
"owner": "platformio",
363-
"version": "0.0.0-alpha+sha.de1b85a130"
364-
},
365-
"framework-zephyr-loramac-node": {
366-
"optional": true,
367-
"owner": "platformio",
368-
"version": "0.0.0-alpha+sha.3f545d76a2"
369-
},
370-
"framework-zephyr-openthread": {
371-
"optional": true,
372-
"owner": "platformio",
373-
"version": "0.0.0-alpha+sha.1d668284a0"
374-
},
375-
"framework-zephyr-segger": {
376-
"optional": true,
377-
"owner": "platformio",
378-
"version": "0.0.0-alpha+sha.38c79a447e"
379-
},
380-
"framework-zephyr-sof": {
381-
"optional": true,
382-
"owner": "platformio",
383-
"version": "0.0.0-alpha+sha.b5b772dd61"
384-
},
385-
"framework-zephyr-tinycbor": {
386-
"optional": true,
387-
"owner": "platformio",
388-
"version": "0.0.0-alpha+sha.40daca97b4"
389-
},
390-
"framework-zephyr-tinycrypt": {
391-
"optional": true,
392-
"owner": "platformio",
393-
"version": "0.0.0-alpha+sha.3e9a49d267"
394-
},
395-
"framework-zephyr-littlefs": {
396-
"optional": true,
397-
"owner": "platformio",
398-
"version": "0.0.0-alpha+sha.9e4498d1c7"
399-
},
400-
"framework-zephyr-mipi-sys-t": {
401-
"optional": true,
402-
"owner": "platformio",
403-
"version": "0.0.0-alpha+sha.75e671550a"
404-
},
405-
"framework-zephyr-tfm-mcuboot": {
406-
"optional": true,
407-
"owner": "platformio",
408-
"version": "1.7.0-rc1"
409-
},
410-
"framework-zephyr-trusted-firmware-m": {
411-
"optional": true,
412-
"owner": "platformio",
413-
"version": "0.0.0-alpha+sha.96340fb6c0"
303+
"version": "~2.20600.0"
414304
},
415305
"tool-stm32duino": {
416306
"type": "uploader",

platform.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ def configure_default_packages(self, variables, targets):
8787

8888
if "zephyr" in variables.get("pioframework", []):
8989
for p in self.packages:
90-
if p.startswith("framework-zephyr-") or p in (
91-
"tool-cmake", "tool-dtc", "tool-ninja"):
90+
if p in ("tool-cmake", "tool-dtc", "tool-ninja"):
9291
self.packages[p]["optional"] = False
9392
self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0"
9493
if "windows" not in get_systype():

0 commit comments

Comments
 (0)