From 4e59a5190296cabd1be8de158d18d22444381958 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 16 Sep 2022 12:31:06 -0500
Subject: [PATCH] zephyr: Replace zephyr.h with kernel.h.

Zephyr v3.2.0 deprecated include/zephyr/zephyr.h in favor of
include/zephyr/kernel.h since it only included that header.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/machine_i2c.c          | 2 +-
 ports/zephyr/machine_pin.c          | 2 +-
 ports/zephyr/machine_spi.c          | 2 +-
 ports/zephyr/machine_uart.c         | 2 +-
 ports/zephyr/main.c                 | 2 +-
 ports/zephyr/modsocket.c            | 2 +-
 ports/zephyr/modtime.c              | 2 +-
 ports/zephyr/modzephyr.c            | 2 +-
 ports/zephyr/modzsensor.c           | 2 +-
 ports/zephyr/mpconfigport.h         | 2 +-
 ports/zephyr/mpconfigport_minimal.h | 2 +-
 ports/zephyr/mphalport.h            | 2 +-
 ports/zephyr/mpthreadport.h         | 2 +-
 ports/zephyr/src/zephyr_getchar.c   | 2 +-
 ports/zephyr/src/zephyr_start.c     | 2 +-
 ports/zephyr/uart_core.c            | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 27c0a63a0e..342ebafe7a 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 97a852be8a..8a62ea1d26 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 5c090e15cf..2474f2bb87 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index bd40137a3e..ae5ac4a191 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -28,7 +28,7 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 
 #include "py/mperrno.h"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index a2af609ed3..7a18f48165 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #ifdef CONFIG_NETWORKING
 #include <zephyr/net/net_context.h>
 #endif
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index cef9933b28..1ca84edcac 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -31,7 +31,7 @@
 #include "py/stream.h"
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 // Zephyr's generated version header
 #include <version.h>
 #include <zephyr/net/net_context.h>
diff --git a/ports/zephyr/modtime.c b/ports/zephyr/modtime.c
index f1181232ae..b042095ed9 100644
--- a/ports/zephyr/modtime.c
+++ b/ports/zephyr/modtime.c
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "py/obj.h"
 
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 2e3fc2fecf..c059c7e395 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -29,7 +29,7 @@
 #if MICROPY_PY_ZEPHYR
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/debug/thread_analyzer.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/shell/shell_uart.h>
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 58775b980a..de7fe7f527 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -28,7 +28,7 @@
 
 #include "py/runtime.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 
 #if MICROPY_PY_ZSENSOR
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 26465cbb59..a2e74e6928 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -28,7 +28,7 @@
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
 #include "autoconf.h"
 // Included here to get basic Zephyr environment (macros, etc.)
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
 // Usually passed from Makefile
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index d81e007e03..9aae20c72c 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -28,7 +28,7 @@
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
 #include "autoconf.h"
 // Included here to get basic Zephyr environment (macros, etc.)
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index e1f402cb3f..e5414c2705 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,4 +1,4 @@
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "shared/runtime/interrupt_char.h"
 
 #define MICROPY_BEGIN_ATOMIC_SECTION irq_lock
diff --git a/ports/zephyr/mpthreadport.h b/ports/zephyr/mpthreadport.h
index 37dd725321..b0165bad1c 100644
--- a/ports/zephyr/mpthreadport.h
+++ b/ports/zephyr/mpthreadport.h
@@ -29,7 +29,7 @@
 #ifndef MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
 #define MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 typedef struct _mp_thread_mutex_t {
     struct k_sem handle;
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 3dd8713773..94e35e2e84 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/console/uart_console.h>
 #include <zephyr/sys/printk.h>
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index 3b00bac121..e15f874b16 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "zephyr_getchar.h"
 
 int real_main(void);
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 7e2db3653b..ee525c33f7 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -28,7 +28,7 @@
 #include "py/runtime.h"
 #include "src/zephyr_getchar.h"
 // Zephyr headers
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/console/console.h>
 #include <zephyr/console/tty.h>