diff options
| author | David Schneider <schneidav81@gmail.com> | 2025-06-23 14:52:57 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-07-08 09:53:24 +1000 |
| commit | 16d9e704aeb48d9507c56bf90f565c0b19b3fb79 (patch) | |
| tree | a385d7a4e9295f78d1da83c7686dbf1d34ca94d4 | |
| parent | 5eb94df09ec5964822b9de64d6430de16901562d (diff) | |
zephyr: Update generated header path.
Support disabled LEGACY_GENERATED_INCLUDE_PATH compatibility option.
Since Zephyr 3.7 generated include files are namespaced.
See also: zephyrproject-rtos/zephyr@bbe5e1e6ebf4a1a66c0
Signed-off-by: David Schneider <schneidav81@gmail.com>
| -rw-r--r-- | ports/zephyr/modsocket.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/mpconfigport.h | 2 | ||||
| -rw-r--r-- | ports/zephyr/mpconfigport_minimal.h | 2 | ||||
| -rw-r--r-- | ports/zephyr/prj.conf | 2 | ||||
| -rw-r--r-- | ports/zephyr/prj_minimal.conf | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c index 1ca84edca..d8955bffb 100644 --- a/ports/zephyr/modsocket.c +++ b/ports/zephyr/modsocket.c @@ -32,8 +32,6 @@ #include <stdio.h> #include <zephyr/kernel.h> -// Zephyr's generated version header -#include <version.h> #include <zephyr/net/net_context.h> #include <zephyr/net/net_pkt.h> #include <zephyr/net/dns_resolve.h> diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h index 3a6e93486..e7e67b02d 100644 --- a/ports/zephyr/mpconfigport.h +++ b/ports/zephyr/mpconfigport.h @@ -26,7 +26,7 @@ #include <alloca.h> // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles -#include "autoconf.h" +#include <zephyr/autoconf.h> // Included here to get basic Zephyr environment (macros, etc.) #include <zephyr/kernel.h> #include <zephyr/drivers/spi.h> diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h index 9aae20c72..a0a7f9739 100644 --- a/ports/zephyr/mpconfigport_minimal.h +++ b/ports/zephyr/mpconfigport_minimal.h @@ -26,7 +26,7 @@ #include <alloca.h> // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles -#include "autoconf.h" +#include <zephyr/autoconf.h> // Included here to get basic Zephyr environment (macros, etc.) #include <zephyr/kernel.h> diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf index 011cb72cf..0939e226c 100644 --- a/ports/zephyr/prj.conf +++ b/ports/zephyr/prj.conf @@ -81,3 +81,5 @@ CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y CONFIG_UART_USE_RUNTIME_CONFIGURE=y + +CONFIG_LEGACY_GENERATED_INCLUDE_PATH=n diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf index 3f9acc655..f58c932ce 100644 --- a/ports/zephyr/prj_minimal.conf +++ b/ports/zephyr/prj_minimal.conf @@ -10,3 +10,5 @@ CONFIG_CONSOLE_GETCHAR_BUFSIZE=258 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=32 CONFIG_MICROPY_HEAP_SIZE=16384 + +CONFIG_LEGACY_GENERATED_INCLUDE_PATH=n |