Skip to content

ports/zephyr-cp: pass boards/<board>.overlay and .conf for aliased bo… #11235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lynt-smitka wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

ports/zephyr-cp: pass boards/<board>.overlay and .conf for aliased bo… #11235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ports/zephyr-cp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,27 @@ endif

WEST_CMAKE_ARGS := -DZEPHYR_BOARD_ALIASES=$(CURDIR)/boards/board_aliases.cmake -Dzephyr-cp_TRANSLATION=$(TRANSLATION)

# Board files named after the CircuitPython board. Zephyr resolves boards/<name>.overlay and
# boards/<name>.conf by the ALIASED board name, so a board declared through cp_board_alias() never
# picks up files named after itself - the build silently produces a different firmware instead of
# warning. Pass them explicitly when they exist.
CP_BOARD_OVERLAY := $(wildcard $(CURDIR)/boards/$(BOARD).overlay)
ifneq ($(CP_BOARD_OVERLAY),)
WEST_CMAKE_ARGS += -Dzephyr-cp_EXTRA_DTC_OVERLAY_FILE=$(CP_BOARD_OVERLAY)
endif
CP_BOARD_CONF := $(wildcard $(CURDIR)/boards/$(BOARD).conf)

# When DEBUG=1, apply additional Kconfig fragments for debug-friendly settings.
DEBUG_CONF_FILE ?= $(CURDIR)/debug.conf
ifeq ($(DEBUG),1)
WEST_CMAKE_ARGS += -Dzephyr-cp_EXTRA_CONF_FILE=$(DEBUG_CONF_FILE)
ifneq ($(CP_BOARD_CONF),)
CP_BOARD_CONF := $(CP_BOARD_CONF);$(DEBUG_CONF_FILE)
else
CP_BOARD_CONF := $(DEBUG_CONF_FILE)
endif
endif
ifneq ($(CP_BOARD_CONF),)
WEST_CMAKE_ARGS += -Dzephyr-cp_EXTRA_CONF_FILE=$(CP_BOARD_CONF)
endif

.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash recover debug debug-jlink debugserver attach run run-sim clean menuconfig all clean-all sim clean-sim test fetch-port-submodules
Expand Down
Loading