From 16d9e704aeb48d9507c56bf90f565c0b19b3fb79 Mon Sep 17 00:00:00 2001
From: David Schneider <schneidav81@gmail.com>
Date: Mon, 23 Jun 2025 14:52:57 +0200
Subject: [PATCH] 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>
---
 ports/zephyr/modsocket.c            | 2 --
 ports/zephyr/mpconfigport.h         | 2 +-
 ports/zephyr/mpconfigport_minimal.h | 2 +-
 ports/zephyr/prj.conf               | 2 ++
 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 1ca84edcac..d8955bffbe 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 3a6e934862..e7e67b02d6 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 9aae20c72c..a0a7f97394 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 011cb72cfd..0939e226cf 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 3f9acc655e..f58c932cea 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