From feab11d4a9ee24f73e0a8ec759c9b636c92b4635 Mon Sep 17 00:00:00 2001
From: TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
Date: Tue, 20 Sep 2022 07:06:05 +0900
Subject: [PATCH 1/2] variants: include kernel.h instead of zephyr.h

The zephyr.h is already deprecated.
Using kernel.h instead of it.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
---
 variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h       | 2 +-
 .../arduino_nano_33_ble_sense_pinmap.h                          | 2 +-
 variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h       | 2 +-
 variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h b/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
index 9a9893ae..de31116e 100644
--- a/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
+++ b/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
@@ -7,7 +7,7 @@
 /* All the pins that are 100 + x are gpio1 pins and < 100 are in gpio0 */
 #pragma once
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
 
diff --git a/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
index 9a9893ae..de31116e 100644
--- a/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
+++ b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
@@ -7,7 +7,7 @@
 /* All the pins that are 100 + x are gpio1 pins and < 100 are in gpio0 */
 #pragma once
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
 
diff --git a/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h b/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
index 9a9893ae..de31116e 100644
--- a/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
+++ b/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
@@ -7,7 +7,7 @@
 /* All the pins that are 100 + x are gpio1 pins and < 100 are in gpio0 */
 #pragma once
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
 
diff --git a/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h b/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h
index f5a4d78d..9324974a 100644
--- a/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h
+++ b/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LED_BUILTIN 22
 

From 3f4d4733f91fd4f4936dfbe8104e23cb9083a6a0 Mon Sep 17 00:00:00 2001
From: TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
Date: Tue, 20 Sep 2022 07:11:47 +0900
Subject: [PATCH 2/2] cores: include kernel.h instead of zephyr.h

The zephyr.h is already deprecated.
Use kernel.h instead of it.
---
 cores/arduino/Arduino.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 4d1197ec..cf47a8b9 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -7,7 +7,7 @@
 #include "api/ArduinoAPI.h"
 
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <variants.h>
 #include <zephyrSerial.h>
\ No newline at end of file