Skip to content

Commit df8b3e5

Browse files
committed
Guard zephyr include. Add fetch-port-submodules make target
1 parent 1dc9c83 commit df8b3e5

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ports/zephyr-cp/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ BUILD ?= build-$(BOARD)
88

99
TRANSLATION ?= en_US
1010

11-
.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash debug run clean menuconfig all clean-all test
11+
.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash debug run clean menuconfig all clean-all test fetch-port-submodules
1212

1313
$(BUILD)/zephyr-cp/zephyr/zephyr.elf:
1414
python cptools/pre_zephyr_build_prep.py $(BOARD)
@@ -38,6 +38,9 @@ menuconfig:
3838
clean:
3939
rm -rf $(BUILD)
4040

41+
fetch-port-submodules:
42+
python ../../tools/ci_fetch_deps.py zephyr-cp
43+
4144
# Build all boards. The + prefix allows jobserver file descriptors to be passed through.
4245
# This enables parallel builds across all boards when invoked with `make -jN all`.
4346
all:

supervisor/shared/safe_mode.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
#include "supervisor/shared/translate/translate.h"
1919
#include "supervisor/shared/tick.h"
2020

21+
#if __ZEPHYR__
2122
#include <zephyr/kernel.h>
23+
#endif
2224

2325
#define SAFE_MODE_DATA_GUARD 0xad0000af
2426
#define SAFE_MODE_DATA_GUARD_MASK 0xff0000ff

0 commit comments

Comments
 (0)