From c5022808a754c4d9be439e7b55a4fd7576559f96 Mon Sep 17 00:00:00 2001
From: Vladimir Smitka <vladimir.smitka@lynt.cz>
Date: Sun, 23 Aug 2026 18:50:59 +0000
Subject: [PATCH 1/2] ports/zephyr-cp: pass boards/<board>.overlay and .conf
 for aliased boards

Zephyr looks up boards/<name>.overlay and boards/<name>.conf by the
resolved board name, so a board declared through cp_board_alias()
never picks up files named after itself. The build succeeds and
silently produces a firmware without the board's devicetree and
Kconfig fragments.

Pass the files as zephyr-cp_EXTRA_DTC_OVERLAY_FILE / _EXTRA_CONF_FILE
when they exist. DEBUG=1 appends its fragment to the same list
instead of replacing it.

Verified with a board aliased to rpi_pico/rp2040 with both files
present: zephyr.dts now cites the overlay and .config carries the
board's options. Boards without such files are unaffected.
---
 ports/zephyr-cp/Makefile | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ports/zephyr-cp/Makefile b/ports/zephyr-cp/Makefile
index ab730a8b339..9b6a3d85fbe 100644
--- a/ports/zephyr-cp/Makefile
+++ b/ports/zephyr-cp/Makefile
@@ -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

From d733f056339bcbcb5dad5fdd454ba0fb2d6ca0b7 Mon Sep 17 00:00:00 2001
From: Vladimir Smitka <vladimir.smitka@lynt.cz>
Date: Tue, 25 Aug 2026 16:05:28 +0000
Subject: [PATCH 2/2] ports/zephyr-cp: keep board overlays and Kconfig
 fragments in the board folder

Each board now keeps board.overlay and board.conf next to its
circuitpython.toml in boards/<vendor>/<board>/, rather than at the top level
where files named after Zephyr boards and files named after CircuitPython
boards shared one directory.

Now that these files reliably reach the board they belong to, the
replace-vs-add distinction starts to matter: the overlay goes through
DTC_OVERLAY_FILE rather than EXTRA_DTC_OVERLAY_FILE, because a board overlay
replaces app.overlay. That is why the overlays here include app.overlay
themselves, and why the nRF54L15 DK, which has no USB, deliberately does not.
The Kconfig fragment stays additive, so DEBUG=1 still appends its own.

boards/frdm_rw612_rw612_cpu0.overlay is dropped: no build string matches that
name, so it was never applied, and its devicetree does not parse.

Verified by configuring all 28 boards before and after the move - the
generated .config and devicetree are identical for every one.
---
 ports/zephyr-cp/AGENTS.md                     |  5 +++--
 ports/zephyr-cp/Makefile                      | 20 ++++++++++++-------
 .../clue_nrf52840_zephyr/board.conf}          |  0
 .../clue_nrf52840_zephyr/board.overlay}       |  2 +-
 .../feather_nrf52840_sense_zephyr/board.conf} |  0
 .../board.overlay}                            |  2 +-
 .../feather_nrf52840_zephyr/board.conf}       |  0
 .../feather_nrf52840_zephyr/board.overlay}    |  2 +-
 .../feather_rp2040_zephyr/board.conf}         |  0
 .../feather_rp2040_zephyr/board.overlay}      |  2 +-
 .../boards/frdm_rw612_rw612_cpu0.overlay      | 18 -----------------
 .../native_sim/board.conf}                    |  0
 .../native_sim/board.overlay}                 |  2 +-
 .../nrf5340bsim/board.conf}                   |  0
 .../nrf5340bsim/board.overlay}                |  0
 .../nrf54lm20bsim/board.conf}                 |  0
 .../nrf54lm20bsim/board.overlay}              |  0
 .../nrf5340dk/board.overlay}                  |  2 +-
 .../nrf54h20dk/board.conf}                    |  0
 .../nrf54h20dk/board.overlay}                 |  2 +-
 .../nrf54l15dk/board.overlay}                 |  0
 .../nrf54l15tag/board.conf}                   |  0
 .../nrf54l15tag/board.overlay}                |  0
 .../nrf54lm20dk/board.conf}                   |  0
 .../nrf54lm20dk/board.overlay}                |  2 +-
 .../nrf7002dk/board.conf}                     |  0
 .../nrf7002dk/board.overlay}                  |  2 +-
 .../frdm_mcxn947/board.conf}                  |  0
 .../frdm_mcxn947/board.overlay}               |  2 +-
 .../frdm_rw612/board.conf}                    |  0
 .../frdm_rw612/board.overlay}                 |  2 +-
 .../mimxrt1170_evk/board.conf}                |  0
 .../mimxrt1170_evk/board.overlay}             |  2 +-
 .../rpi_pico2_w_zephyr/board.conf}            |  0
 .../rpi_pico2_w_zephyr/board.overlay}         |  2 +-
 .../rpi_pico2_zephyr/board.overlay}           |  2 +-
 .../rpi_pico_w_zephyr/board.conf}             |  0
 .../rpi_pico_w_zephyr/board.overlay}          |  2 +-
 .../rpi_pico_zephyr/board.overlay}            |  2 +-
 .../da14695_dk_usb/board.overlay}             |  2 +-
 .../ek_ra8d1/board.conf}                      |  0
 .../ek_ra8d1/board.overlay}                   |  2 +-
 .../stm32h750b_dk/board.conf}                 |  0
 .../stm32h750b_dk/board.overlay}              |  0
 .../stm32h7b3i_dk/board.conf}                 |  0
 .../stm32h7b3i_dk/board.overlay}              |  2 +-
 .../stm32wba65i_dk1/board.conf}               |  0
 .../stm32wba65i_dk1/board.overlay}            |  2 +-
 48 files changed, 36 insertions(+), 47 deletions(-)
 rename ports/zephyr-cp/boards/{adafruit_clue_nrf52840_uf2.conf => adafruit/clue_nrf52840_zephyr/board.conf} (100%)
 rename ports/zephyr-cp/boards/{adafruit_clue_nrf52840_uf2.overlay => adafruit/clue_nrf52840_zephyr/board.overlay} (96%)
 rename ports/zephyr-cp/boards/{adafruit_feather_nrf52840_nrf52840_sense_uf2.conf => adafruit/feather_nrf52840_sense_zephyr/board.conf} (100%)
 rename ports/zephyr-cp/boards/{adafruit_feather_nrf52840_nrf52840_sense_uf2.overlay => adafruit/feather_nrf52840_sense_zephyr/board.overlay} (96%)
 rename ports/zephyr-cp/boards/{adafruit_feather_nrf52840_uf2.conf => adafruit/feather_nrf52840_zephyr/board.conf} (100%)
 rename ports/zephyr-cp/boards/{adafruit_feather_nrf52840_uf2.overlay => adafruit/feather_nrf52840_zephyr/board.overlay} (96%)
 rename ports/zephyr-cp/boards/{adafruit_feather_rp2040.conf => adafruit/feather_rp2040_zephyr/board.conf} (100%)
 rename ports/zephyr-cp/boards/{adafruit_feather_rp2040.overlay => adafruit/feather_rp2040_zephyr/board.overlay} (96%)
 delete mode 100644 ports/zephyr-cp/boards/frdm_rw612_rw612_cpu0.overlay
 rename ports/zephyr-cp/boards/{native_sim.conf => native/native_sim/board.conf} (100%)
 rename ports/zephyr-cp/boards/{native_sim.overlay => native/native_sim/board.overlay} (97%)
 rename ports/zephyr-cp/boards/{nrf5340bsim_nrf5340_cpuapp.conf => native/nrf5340bsim/board.conf} (100%)
 rename ports/zephyr-cp/boards/{nrf5340bsim_nrf5340_cpuapp.overlay => native/nrf5340bsim/board.overlay} (100%)
 rename ports/zephyr-cp/boards/{nrf54lm20bsim_nrf54lm20a_cpuapp.conf => native/nrf54lm20bsim/board.conf} (100%)
 rename ports/zephyr-cp/boards/{nrf54lm20bsim_nrf54lm20a_cpuapp.overlay => native/nrf54lm20bsim/board.overlay} (100%)
 rename ports/zephyr-cp/boards/{nrf5340dk_nrf5340_cpuapp.overlay => nordic/nrf5340dk/board.overlay} (95%)
 rename ports/zephyr-cp/boards/{nrf54h20dk_nrf54h20_cpuapp.conf => nordic/nrf54h20dk/board.conf} (100%)
 rename ports/zephyr-cp/boards/{nrf54h20dk_nrf54h20_cpuapp.overlay => nordic/nrf54h20dk/board.overlay} (96%)
 rename ports/zephyr-cp/boards/{nrf54l15dk_nrf54l15_cpuapp.overlay => nordic/nrf54l15dk/board.overlay} (100%)
 rename ports/zephyr-cp/boards/{nrf54l15tag_nrf54l15_cpuapp.conf => nordic/nrf54l15tag/board.conf} (100%)
 rename ports/zephyr-cp/boards/{nrf54l15tag_nrf54l15_cpuapp.overlay => nordic/nrf54l15tag/board.overlay} (100%)
 rename ports/zephyr-cp/boards/{nrf54lm20dk_nrf54lm20a_cpuapp.conf => nordic/nrf54lm20dk/board.conf} (100%)
 rename ports/zephyr-cp/boards/{nrf54lm20dk_nrf54lm20a_cpuapp.overlay => nordic/nrf54lm20dk/board.overlay} (97%)
 rename ports/zephyr-cp/boards/{nrf7002dk_nrf5340_cpuapp.conf => nordic/nrf7002dk/board.conf} (100%)
 rename ports/zephyr-cp/boards/{nrf7002dk_nrf5340_cpuapp.overlay => nordic/nrf7002dk/board.overlay} (90%)
 rename ports/zephyr-cp/boards/{frdm_mcxn947_mcxn947_cpu0.conf => nxp/frdm_mcxn947/board.conf} (100%)
 rename ports/zephyr-cp/boards/{frdm_mcxn947_mcxn947_cpu0.overlay => nxp/frdm_mcxn947/board.overlay} (94%)
 rename ports/zephyr-cp/boards/{frdm_rw612.conf => nxp/frdm_rw612/board.conf} (100%)
 rename ports/zephyr-cp/boards/{frdm_rw612.overlay => nxp/frdm_rw612/board.overlay} (93%)
 rename ports/zephyr-cp/boards/{mimxrt1170_evk_mimxrt1176_cm7.conf => nxp/mimxrt1170_evk/board.conf} (100%)
 rename ports/zephyr-cp/boards/{mimxrt1170_evk_mimxrt1176_cm7.overlay => nxp/mimxrt1170_evk/board.overlay} (93%)
 rename ports/zephyr-cp/boards/{rpi_pico2_rp2350a_m33_w.conf => raspberrypi/rpi_pico2_w_zephyr/board.conf} (100%)
 rename ports/zephyr-cp/boards/{rpi_pico2_rp2350a_m33.overlay => raspberrypi/rpi_pico2_w_zephyr/board.overlay} (95%)
 rename ports/zephyr-cp/boards/{rpi_pico2_rp2350a_m33_w.overlay => raspberrypi/rpi_pico2_zephyr/board.overlay} (95%)
 rename ports/zephyr-cp/boards/{rpi_pico_rp2040_w.conf => raspberrypi/rpi_pico_w_zephyr/board.conf} (100%)
 rename ports/zephyr-cp/boards/{rpi_pico_rp2040_w.overlay => raspberrypi/rpi_pico_w_zephyr/board.overlay} (96%)
 rename ports/zephyr-cp/boards/{rpi_pico_rp2040.overlay => raspberrypi/rpi_pico_zephyr/board.overlay} (96%)
 rename ports/zephyr-cp/boards/{da14695_dk_usb.overlay => renesas/da14695_dk_usb/board.overlay} (92%)
 rename ports/zephyr-cp/boards/{ek_ra8d1.conf => renesas/ek_ra8d1/board.conf} (100%)
 rename ports/zephyr-cp/boards/{ek_ra8d1.overlay => renesas/ek_ra8d1/board.overlay} (59%)
 rename ports/zephyr-cp/boards/{stm32h750b_dk_stm32h750xx_ext_flash_app.conf => st/stm32h750b_dk/board.conf} (100%)
 rename ports/zephyr-cp/boards/{stm32h750b_dk_stm32h750xx_ext_flash_app.overlay => st/stm32h750b_dk/board.overlay} (100%)
 rename ports/zephyr-cp/boards/{stm32h7b3i_dk.conf => st/stm32h7b3i_dk/board.conf} (100%)
 rename ports/zephyr-cp/boards/{stm32h7b3i_dk.overlay => st/stm32h7b3i_dk/board.overlay} (96%)
 rename ports/zephyr-cp/boards/{stm32wba65i_dk1.conf => st/stm32wba65i_dk1/board.conf} (100%)
 rename ports/zephyr-cp/boards/{stm32wba65i_dk1.overlay => st/stm32wba65i_dk1/board.overlay} (98%)

diff --git a/ports/zephyr-cp/AGENTS.md b/ports/zephyr-cp/AGENTS.md
index 58a3912e2ba..e8e240bde80 100644
--- a/ports/zephyr-cp/AGENTS.md
+++ b/ports/zephyr-cp/AGENTS.md
@@ -1,6 +1,7 @@
 - Build a board by doing `make BOARD=<vendor>_<board_name>`.
-- The corresponding configuration files are in `boards/<vendor>/<board_name>`
-- The files (not folders) in `boards/` directory are used by Zephyr.
+- The corresponding configuration files are in `boards/<vendor>/<board_name>`, including the
+  board's devicetree overlay (`board.overlay`) and Kconfig fragment (`board.conf`). The Makefile
+  passes them to Zephyr; the overlay replaces `app.overlay`, so include it if the board wants it.
 - To flash it on a board do `make BOARD=<vendor>_<board_name> flash`.
 - Zephyr board docs are at `zephyr/boards/<vendor>/<board_name>`.
 - Run zephyr-cp tests with `make test`.
diff --git a/ports/zephyr-cp/Makefile b/ports/zephyr-cp/Makefile
index 9b6a3d85fbe..74a40e737e5 100644
--- a/ports/zephyr-cp/Makefile
+++ b/ports/zephyr-cp/Makefile
@@ -15,15 +15,21 @@ 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)
+# Board files live in the board's own folder as board.overlay / board.conf. Zephyr only auto-applies
+# boards/<name>.overlay and boards/<name>.conf named after the RESOLVED Zephyr board, so it finds
+# neither those (wrong directory) nor files named after a board declared through cp_board_alias()
+# (wrong name) - the build silently produces a different firmware instead of warning. Pass them
+# explicitly when they exist.
+CP_BOARD_DIR := $(CURDIR)/boards/$(firstword $(subst _, ,$(BOARD)))/$(patsubst $(firstword $(subst _, ,$(BOARD)))_%,%,$(BOARD))
+# DTC_OVERLAY_FILE, not EXTRA_: a board overlay REPLACES app.overlay (Zephyr only falls back to
+# app.overlay when no board overlay is found), which is why the board overlays here include it
+# themselves - and why one board that has no USB deliberately does not. Adding the overlay instead
+# would force app.overlay on every board. socs/ ships .conf only, so nothing else is displaced.
+CP_BOARD_OVERLAY := $(wildcard $(CP_BOARD_DIR)/board.overlay)
 ifneq ($(CP_BOARD_OVERLAY),)
-WEST_CMAKE_ARGS += -Dzephyr-cp_EXTRA_DTC_OVERLAY_FILE=$(CP_BOARD_OVERLAY)
+WEST_CMAKE_ARGS += -Dzephyr-cp_DTC_OVERLAY_FILE=$(CP_BOARD_OVERLAY)
 endif
-CP_BOARD_CONF := $(wildcard $(CURDIR)/boards/$(BOARD).conf)
+CP_BOARD_CONF := $(wildcard $(CP_BOARD_DIR)/board.conf)
 
 # When DEBUG=1, apply additional Kconfig fragments for debug-friendly settings.
 DEBUG_CONF_FILE ?= $(CURDIR)/debug.conf
diff --git a/ports/zephyr-cp/boards/adafruit_clue_nrf52840_uf2.conf b/ports/zephyr-cp/boards/adafruit/clue_nrf52840_zephyr/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/adafruit_clue_nrf52840_uf2.conf
rename to ports/zephyr-cp/boards/adafruit/clue_nrf52840_zephyr/board.conf
diff --git a/ports/zephyr-cp/boards/adafruit_clue_nrf52840_uf2.overlay b/ports/zephyr-cp/boards/adafruit/clue_nrf52840_zephyr/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/adafruit_clue_nrf52840_uf2.overlay
rename to ports/zephyr-cp/boards/adafruit/clue_nrf52840_zephyr/board.overlay
index 405b65ec8eb..586165dfe06 100644
--- a/ports/zephyr-cp/boards/adafruit_clue_nrf52840_uf2.overlay
+++ b/ports/zephyr-cp/boards/adafruit/clue_nrf52840_zephyr/board.overlay
@@ -46,4 +46,4 @@
     status = "okay";
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_nrf52840_sense_uf2.conf b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_sense_zephyr/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/adafruit_feather_nrf52840_nrf52840_sense_uf2.conf
rename to ports/zephyr-cp/boards/adafruit/feather_nrf52840_sense_zephyr/board.conf
diff --git a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_nrf52840_sense_uf2.overlay b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_sense_zephyr/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/adafruit_feather_nrf52840_nrf52840_sense_uf2.overlay
rename to ports/zephyr-cp/boards/adafruit/feather_nrf52840_sense_zephyr/board.overlay
index 405b65ec8eb..586165dfe06 100644
--- a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_nrf52840_sense_uf2.overlay
+++ b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_sense_zephyr/board.overlay
@@ -46,4 +46,4 @@
     status = "okay";
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf
rename to ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/board.conf
diff --git a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.overlay b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.overlay
rename to ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/board.overlay
index 405b65ec8eb..586165dfe06 100644
--- a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.overlay
+++ b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/board.overlay
@@ -46,4 +46,4 @@
     status = "okay";
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/adafruit_feather_rp2040.conf b/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/adafruit_feather_rp2040.conf
rename to ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.conf
diff --git a/ports/zephyr-cp/boards/adafruit_feather_rp2040.overlay b/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/adafruit_feather_rp2040.overlay
rename to ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.overlay
index a19e2a066db..10cc674a66a 100644
--- a/ports/zephyr-cp/boards/adafruit_feather_rp2040.overlay
+++ b/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.overlay
@@ -40,4 +40,4 @@
 	};
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/frdm_rw612_rw612_cpu0.overlay b/ports/zephyr-cp/boards/frdm_rw612_rw612_cpu0.overlay
deleted file mode 100644
index e57b5b6d331..00000000000
--- a/ports/zephyr-cp/boards/frdm_rw612_rw612_cpu0.overlay
+++ /dev/null
@@ -1,18 +0,0 @@
-&w25q512jvfiq {
-    partitions {
-        /delete-node/ storage_partition;
-        storage_partition: partition@620000 {
-				compatible = "zephyr,mapped-partition";
-				label = "storage";
-				reg = <0x00620000 DT_SIZE_K(32)>;
-			};
-        circuitpy_partition: partition@628000 {
-				compatible = "zephyr,mapped-partition";
-				label = "circuitpy";
-				reg = <0x00628000 (DT_SIZE_M(58) - DT_SIZE_K(128) - DT_SIZE_K(32))>;
-			};
-    }
-
-};
-
-#include "../app.overlay"
diff --git a/ports/zephyr-cp/boards/native_sim.conf b/ports/zephyr-cp/boards/native/native_sim/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/native_sim.conf
rename to ports/zephyr-cp/boards/native/native_sim/board.conf
diff --git a/ports/zephyr-cp/boards/native_sim.overlay b/ports/zephyr-cp/boards/native/native_sim/board.overlay
similarity index 97%
rename from ports/zephyr-cp/boards/native_sim.overlay
rename to ports/zephyr-cp/boards/native/native_sim/board.overlay
index f94f71726a8..d59a13db80d 100644
--- a/ports/zephyr-cp/boards/native_sim.overlay
+++ b/ports/zephyr-cp/boards/native/native_sim/board.overlay
@@ -60,4 +60,4 @@
 	};
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf b/ports/zephyr-cp/boards/native/nrf5340bsim/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf
rename to ports/zephyr-cp/boards/native/nrf5340bsim/board.conf
diff --git a/ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/ports/zephyr-cp/boards/native/nrf5340bsim/board.overlay
similarity index 100%
rename from ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.overlay
rename to ports/zephyr-cp/boards/native/nrf5340bsim/board.overlay
diff --git a/ports/zephyr-cp/boards/nrf54lm20bsim_nrf54lm20a_cpuapp.conf b/ports/zephyr-cp/boards/native/nrf54lm20bsim/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/nrf54lm20bsim_nrf54lm20a_cpuapp.conf
rename to ports/zephyr-cp/boards/native/nrf54lm20bsim/board.conf
diff --git a/ports/zephyr-cp/boards/nrf54lm20bsim_nrf54lm20a_cpuapp.overlay b/ports/zephyr-cp/boards/native/nrf54lm20bsim/board.overlay
similarity index 100%
rename from ports/zephyr-cp/boards/nrf54lm20bsim_nrf54lm20a_cpuapp.overlay
rename to ports/zephyr-cp/boards/native/nrf54lm20bsim/board.overlay
diff --git a/ports/zephyr-cp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/ports/zephyr-cp/boards/nordic/nrf5340dk/board.overlay
similarity index 95%
rename from ports/zephyr-cp/boards/nrf5340dk_nrf5340_cpuapp.overlay
rename to ports/zephyr-cp/boards/nordic/nrf5340dk/board.overlay
index 180d6a23568..6b7ee85de7c 100644
--- a/ports/zephyr-cp/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/ports/zephyr-cp/boards/nordic/nrf5340dk/board.overlay
@@ -29,4 +29,4 @@ i2s_rxtx: &i2s0 {
 
 /delete-node/ &slot1_partition;
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/ports/zephyr-cp/boards/nordic/nrf54h20dk/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/nrf54h20dk_nrf54h20_cpuapp.conf
rename to ports/zephyr-cp/boards/nordic/nrf54h20dk/board.conf
diff --git a/ports/zephyr-cp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/ports/zephyr-cp/boards/nordic/nrf54h20dk/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
rename to ports/zephyr-cp/boards/nordic/nrf54h20dk/board.overlay
index 10df6b9f282..e557179992b 100644
--- a/ports/zephyr-cp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/ports/zephyr-cp/boards/nordic/nrf54h20dk/board.overlay
@@ -52,4 +52,4 @@
 
 /delete-node/ &slot1_partition;
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/ports/zephyr-cp/boards/nordic/nrf54l15dk/board.overlay
similarity index 100%
rename from ports/zephyr-cp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to ports/zephyr-cp/boards/nordic/nrf54l15dk/board.overlay
diff --git a/ports/zephyr-cp/boards/nrf54l15tag_nrf54l15_cpuapp.conf b/ports/zephyr-cp/boards/nordic/nrf54l15tag/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/nrf54l15tag_nrf54l15_cpuapp.conf
rename to ports/zephyr-cp/boards/nordic/nrf54l15tag/board.conf
diff --git a/ports/zephyr-cp/boards/nrf54l15tag_nrf54l15_cpuapp.overlay b/ports/zephyr-cp/boards/nordic/nrf54l15tag/board.overlay
similarity index 100%
rename from ports/zephyr-cp/boards/nrf54l15tag_nrf54l15_cpuapp.overlay
rename to ports/zephyr-cp/boards/nordic/nrf54l15tag/board.overlay
diff --git a/ports/zephyr-cp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/ports/zephyr-cp/boards/nordic/nrf54lm20dk/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
rename to ports/zephyr-cp/boards/nordic/nrf54lm20dk/board.conf
diff --git a/ports/zephyr-cp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/ports/zephyr-cp/boards/nordic/nrf54lm20dk/board.overlay
similarity index 97%
rename from ports/zephyr-cp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
rename to ports/zephyr-cp/boards/nordic/nrf54lm20dk/board.overlay
index c1ebea74a70..0f48a5a5d46 100644
--- a/ports/zephyr-cp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
+++ b/ports/zephyr-cp/boards/nordic/nrf54lm20dk/board.overlay
@@ -1,5 +1,5 @@
 // nRF54LM20 DK has USB. Include the main app overlay for USB CDC ACM console and data.
-#include "../app.overlay"
+#include "../../../app.overlay"
 
 // Link application starting at 0x0 instead of slot0_partition (no mcuboot yet).
 / {
diff --git a/ports/zephyr-cp/boards/nrf7002dk_nrf5340_cpuapp.conf b/ports/zephyr-cp/boards/nordic/nrf7002dk/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/nrf7002dk_nrf5340_cpuapp.conf
rename to ports/zephyr-cp/boards/nordic/nrf7002dk/board.conf
diff --git a/ports/zephyr-cp/boards/nrf7002dk_nrf5340_cpuapp.overlay b/ports/zephyr-cp/boards/nordic/nrf7002dk/board.overlay
similarity index 90%
rename from ports/zephyr-cp/boards/nrf7002dk_nrf5340_cpuapp.overlay
rename to ports/zephyr-cp/boards/nordic/nrf7002dk/board.overlay
index a02349aa7ad..30eb519f93b 100644
--- a/ports/zephyr-cp/boards/nrf7002dk_nrf5340_cpuapp.overlay
+++ b/ports/zephyr-cp/boards/nordic/nrf7002dk/board.overlay
@@ -11,4 +11,4 @@
 
 /delete-node/ &slot1_partition;
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.conf b/ports/zephyr-cp/boards/nxp/frdm_mcxn947/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.conf
rename to ports/zephyr-cp/boards/nxp/frdm_mcxn947/board.conf
diff --git a/ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.overlay b/ports/zephyr-cp/boards/nxp/frdm_mcxn947/board.overlay
similarity index 94%
rename from ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.overlay
rename to ports/zephyr-cp/boards/nxp/frdm_mcxn947/board.overlay
index f1a07471477..3eef280f220 100644
--- a/ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.overlay
+++ b/ports/zephyr-cp/boards/nxp/frdm_mcxn947/board.overlay
@@ -20,4 +20,4 @@
     };
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/frdm_rw612.conf b/ports/zephyr-cp/boards/nxp/frdm_rw612/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/frdm_rw612.conf
rename to ports/zephyr-cp/boards/nxp/frdm_rw612/board.conf
diff --git a/ports/zephyr-cp/boards/frdm_rw612.overlay b/ports/zephyr-cp/boards/nxp/frdm_rw612/board.overlay
similarity index 93%
rename from ports/zephyr-cp/boards/frdm_rw612.overlay
rename to ports/zephyr-cp/boards/nxp/frdm_rw612/board.overlay
index e926394817e..9153fd433ab 100644
--- a/ports/zephyr-cp/boards/frdm_rw612.overlay
+++ b/ports/zephyr-cp/boards/nxp/frdm_rw612/board.overlay
@@ -14,4 +14,4 @@
     };
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.conf b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
rename to ports/zephyr-cp/boards/nxp/mimxrt1170_evk/board.conf
diff --git a/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/board.overlay
similarity index 93%
rename from ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
rename to ports/zephyr-cp/boards/nxp/mimxrt1170_evk/board.overlay
index b8f707dac27..cd5f0089494 100644
--- a/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
+++ b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/board.overlay
@@ -18,4 +18,4 @@
 	mclk-output;
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33_w.conf b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33_w.conf
rename to ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.conf
diff --git a/ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay
similarity index 95%
rename from ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33.overlay
rename to ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay
index ca0400b6645..c35cb42519a 100644
--- a/ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay
@@ -30,4 +30,4 @@
 	};
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33_w.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/board.overlay
similarity index 95%
rename from ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33_w.overlay
rename to ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/board.overlay
index ca0400b6645..c35cb42519a 100644
--- a/ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33_w.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/board.overlay
@@ -30,4 +30,4 @@
 	};
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/rpi_pico_rp2040_w.conf b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/rpi_pico_rp2040_w.conf
rename to ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.conf
diff --git a/ports/zephyr-cp/boards/rpi_pico_rp2040_w.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/rpi_pico_rp2040_w.overlay
rename to ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.overlay
index 1cdd4ca2033..f1228e10138 100644
--- a/ports/zephyr-cp/boards/rpi_pico_rp2040_w.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.overlay
@@ -40,4 +40,4 @@
 	};
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/rpi_pico_rp2040.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/rpi_pico_rp2040.overlay
rename to ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/board.overlay
index 1cdd4ca2033..f1228e10138 100644
--- a/ports/zephyr-cp/boards/rpi_pico_rp2040.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/board.overlay
@@ -40,4 +40,4 @@
 	};
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/da14695_dk_usb.overlay b/ports/zephyr-cp/boards/renesas/da14695_dk_usb/board.overlay
similarity index 92%
rename from ports/zephyr-cp/boards/da14695_dk_usb.overlay
rename to ports/zephyr-cp/boards/renesas/da14695_dk_usb/board.overlay
index cc3b33ec447..6a8343384c9 100644
--- a/ports/zephyr-cp/boards/da14695_dk_usb.overlay
+++ b/ports/zephyr-cp/boards/renesas/da14695_dk_usb/board.overlay
@@ -16,4 +16,4 @@
     };
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/ek_ra8d1.conf b/ports/zephyr-cp/boards/renesas/ek_ra8d1/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/ek_ra8d1.conf
rename to ports/zephyr-cp/boards/renesas/ek_ra8d1/board.conf
diff --git a/ports/zephyr-cp/boards/ek_ra8d1.overlay b/ports/zephyr-cp/boards/renesas/ek_ra8d1/board.overlay
similarity index 59%
rename from ports/zephyr-cp/boards/ek_ra8d1.overlay
rename to ports/zephyr-cp/boards/renesas/ek_ra8d1/board.overlay
index c13dfc457f5..416be7b510e 100644
--- a/ports/zephyr-cp/boards/ek_ra8d1.overlay
+++ b/ports/zephyr-cp/boards/renesas/ek_ra8d1/board.overlay
@@ -2,4 +2,4 @@
     /delete-node/ partitions;
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/stm32h750b_dk_stm32h750xx_ext_flash_app.conf b/ports/zephyr-cp/boards/st/stm32h750b_dk/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/stm32h750b_dk_stm32h750xx_ext_flash_app.conf
rename to ports/zephyr-cp/boards/st/stm32h750b_dk/board.conf
diff --git a/ports/zephyr-cp/boards/stm32h750b_dk_stm32h750xx_ext_flash_app.overlay b/ports/zephyr-cp/boards/st/stm32h750b_dk/board.overlay
similarity index 100%
rename from ports/zephyr-cp/boards/stm32h750b_dk_stm32h750xx_ext_flash_app.overlay
rename to ports/zephyr-cp/boards/st/stm32h750b_dk/board.overlay
diff --git a/ports/zephyr-cp/boards/stm32h7b3i_dk.conf b/ports/zephyr-cp/boards/st/stm32h7b3i_dk/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/stm32h7b3i_dk.conf
rename to ports/zephyr-cp/boards/st/stm32h7b3i_dk/board.conf
diff --git a/ports/zephyr-cp/boards/stm32h7b3i_dk.overlay b/ports/zephyr-cp/boards/st/stm32h7b3i_dk/board.overlay
similarity index 96%
rename from ports/zephyr-cp/boards/stm32h7b3i_dk.overlay
rename to ports/zephyr-cp/boards/st/stm32h7b3i_dk/board.overlay
index d871e728e0d..75e497714c9 100644
--- a/ports/zephyr-cp/boards/stm32h7b3i_dk.overlay
+++ b/ports/zephyr-cp/boards/st/stm32h7b3i_dk/board.overlay
@@ -42,4 +42,4 @@ zephyr_udc0: &usbotg_hs {
     status = "okay";
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"
diff --git a/ports/zephyr-cp/boards/stm32wba65i_dk1.conf b/ports/zephyr-cp/boards/st/stm32wba65i_dk1/board.conf
similarity index 100%
rename from ports/zephyr-cp/boards/stm32wba65i_dk1.conf
rename to ports/zephyr-cp/boards/st/stm32wba65i_dk1/board.conf
diff --git a/ports/zephyr-cp/boards/stm32wba65i_dk1.overlay b/ports/zephyr-cp/boards/st/stm32wba65i_dk1/board.overlay
similarity index 98%
rename from ports/zephyr-cp/boards/stm32wba65i_dk1.overlay
rename to ports/zephyr-cp/boards/st/stm32wba65i_dk1/board.overlay
index 25ef6321eab..e1fc7f0175e 100644
--- a/ports/zephyr-cp/boards/stm32wba65i_dk1.overlay
+++ b/ports/zephyr-cp/boards/st/stm32wba65i_dk1/board.overlay
@@ -73,4 +73,4 @@ zephyr_udc0: &usbotg_hs {
 	interrupt-names = "radio", "radio-sw-low";
 };
 
-#include "../app.overlay"
+#include "../../../app.overlay"