summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2025-01-14 15:16:36 +1100
committerDamien George <damien@micropython.org>2025-01-19 12:45:37 +1100
commitb4f53a0e51a7bb098f67a747fb1c62c21492a1dd (patch)
tree2f54c98d846b61b37de19aedacc550200d962280
parent6db29978ac8954f3686f9eb59dd71b55c3495456 (diff)
qemu/boards: Change boards to use a subdirectory like other ports.
This commit moves `<board>.mk` to `<board>/mpconfigboard.mk` for all qemu boards, making it the same as other bare-metal ports. Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--ports/qemu/Makefile7
-rw-r--r--ports/qemu/boards/MICROBIT/mpconfigboard.mk (renamed from ports/qemu/boards/MICROBIT.mk)0
-rw-r--r--ports/qemu/boards/MPS2_AN385/mpconfigboard.mk (renamed from ports/qemu/boards/MPS2_AN385.mk)0
-rw-r--r--ports/qemu/boards/NETDUINO2/mpconfigboard.mk (renamed from ports/qemu/boards/NETDUINO2.mk)0
-rw-r--r--ports/qemu/boards/SABRELITE/mpconfigboard.mk (renamed from ports/qemu/boards/SABRELITE.mk)0
-rw-r--r--ports/qemu/boards/VIRT_RV32/mpconfigboard.mk (renamed from ports/qemu/boards/VIRT_RV32.mk)0
6 files changed, 6 insertions, 1 deletions
diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
index bf9addc6f..d2550cf88 100644
--- a/ports/qemu/Makefile
+++ b/ports/qemu/Makefile
@@ -2,6 +2,11 @@
# Initial setup of Makefile environment
BOARD ?= MPS2_AN385
+BOARD_DIR ?= boards/$(BOARD)
+
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
# Make the build directory reflect the board.
BUILD ?= build-$(BOARD)
@@ -10,7 +15,7 @@ include ../../py/mkenv.mk
-include mpconfigport.mk
# Include board specific .mk file.
-include boards/$(BOARD).mk
+include $(BOARD_DIR)/mpconfigboard.mk
# qstr definitions (must come before including py.mk)
QSTR_DEFS = qstrdefsport.h
diff --git a/ports/qemu/boards/MICROBIT.mk b/ports/qemu/boards/MICROBIT/mpconfigboard.mk
index 02eb0576c..02eb0576c 100644
--- a/ports/qemu/boards/MICROBIT.mk
+++ b/ports/qemu/boards/MICROBIT/mpconfigboard.mk
diff --git a/ports/qemu/boards/MPS2_AN385.mk b/ports/qemu/boards/MPS2_AN385/mpconfigboard.mk
index 182d076eb..182d076eb 100644
--- a/ports/qemu/boards/MPS2_AN385.mk
+++ b/ports/qemu/boards/MPS2_AN385/mpconfigboard.mk
diff --git a/ports/qemu/boards/NETDUINO2.mk b/ports/qemu/boards/NETDUINO2/mpconfigboard.mk
index ffa781f33..ffa781f33 100644
--- a/ports/qemu/boards/NETDUINO2.mk
+++ b/ports/qemu/boards/NETDUINO2/mpconfigboard.mk
diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE/mpconfigboard.mk
index 80ea08f12..80ea08f12 100644
--- a/ports/qemu/boards/SABRELITE.mk
+++ b/ports/qemu/boards/SABRELITE/mpconfigboard.mk
diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk
index dd9264800..dd9264800 100644
--- a/ports/qemu/boards/VIRT_RV32.mk
+++ b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk