summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zephyr/shim/include/board.h7
-rw-r--r--zephyr/shim/src/gpio.c3
-rw-r--r--zephyr/shim/src/system.c7
-rw-r--r--zephyr/shim/src/tasks.c2
4 files changed, 11 insertions, 8 deletions
diff --git a/zephyr/shim/include/board.h b/zephyr/shim/include/board.h
index 2a54b097b0..4edda8ec7c 100644
--- a/zephyr/shim/include/board.h
+++ b/zephyr/shim/include/board.h
@@ -9,10 +9,11 @@
#include <devicetree.h>
/* Included shimed version of gpio signal. */
-#include <gpio_signal.h>
-/* Include board specific gpio mapping/aliases if named_gpios node exists */
+#include "gpio_signal.h"
+
+/* Include board specific gpio mapping/aliases if named_pgios node exists */
#if DT_NODE_EXISTS(DT_PATH(named_gpios))
-#include <gpio_map.h>
+#include "gpio_map.h"
#endif
#endif /* __BOARD_H */
diff --git a/zephyr/shim/src/gpio.c b/zephyr/shim/src/gpio.c
index bf0d1fd1a5..0b74e44234 100644
--- a/zephyr/shim/src/gpio.c
+++ b/zephyr/shim/src/gpio.c
@@ -4,11 +4,12 @@
*/
#include <device.h>
-#include <gpio.h>
#include <init.h>
#include <kernel.h>
#include <logging/log.h>
+#include "gpio.h"
+
LOG_MODULE_REGISTER(gpio_shim, LOG_LEVEL_ERR);
/*
diff --git a/zephyr/shim/src/system.c b/zephyr/shim/src/system.c
index d9b199e917..8ab1ac3b15 100644
--- a/zephyr/shim/src/system.c
+++ b/zephyr/shim/src/system.c
@@ -3,13 +3,14 @@
* found in the LICENSE file.
*/
+#include <errno.h>
+#include <string.h>
+#include <sys/util.h>
+
#include "config.h"
#include "ec_commands.h"
#include "sysjump.h"
#include "system.h"
-#include <sys/util.h>
-#include <string.h>
-#include <errno.h>
/* Ongoing actions preventing going into deep-sleep mode. */
uint32_t sleep_mask;
diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c
index f954401a45..d3382a655b 100644
--- a/zephyr/shim/src/tasks.c
+++ b/zephyr/shim/src/tasks.c
@@ -6,9 +6,9 @@
#include <kernel.h>
#include <init.h>
#include <sys/atomic.h>
-#include <task.h>
#include "shimmed_tasks.h"
+#include "task.h"
BUILD_ASSERT(CONFIG_NUM_PREEMPT_PRIORITIES >= TASK_ID_COUNT,
"Must increase number of available preempt priorities");