summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/usbc/usb_prl_sm.c1
-rw-r--r--common/usbc/usbc_task.c1
-rw-r--r--include/config.h4
-rw-r--r--zephyr/shim/include/zephyr_shim.h (renamed from zephyr/shim/include/board.h)0
4 files changed, 4 insertions, 2 deletions
diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c
index b1843da6eb..d4bd5b9a6e 100644
--- a/common/usbc/usb_prl_sm.c
+++ b/common/usbc/usb_prl_sm.c
@@ -5,7 +5,6 @@
#include "battery.h"
#include "battery_smart.h"
-#include "board.h"
#include "builtin/assert.h"
#include "charge_manager.h"
#include "charge_state.h"
diff --git a/common/usbc/usbc_task.c b/common/usbc/usbc_task.c
index 56ea3d4d10..6384aae879 100644
--- a/common/usbc/usbc_task.c
+++ b/common/usbc/usbc_task.c
@@ -5,7 +5,6 @@
#include "battery.h"
#include "battery_smart.h"
-#include "board.h"
#include "builtin/assert.h"
#include "charge_manager.h"
#include "charge_state.h"
diff --git a/include/config.h b/include/config.h
index eba3134131..76a7f5dcc6 100644
--- a/include/config.h
+++ b/include/config.h
@@ -5752,7 +5752,11 @@
#endif
#include "config_chip.h"
+#ifdef CONFIG_ZEPHYR
+#include "zephyr_shim.h"
+#else
#include "board.h"
+#endif
/*
* Define CONFIG_HOST_ESPI_VW_POWER_SIGNAL if any power signals from the host
diff --git a/zephyr/shim/include/board.h b/zephyr/shim/include/zephyr_shim.h
index 3e12568155..3e12568155 100644
--- a/zephyr/shim/include/board.h
+++ b/zephyr/shim/include/zephyr_shim.h