From b4f53a0e51a7bb098f67a747fb1c62c21492a1dd Mon Sep 17 00:00:00 2001 From: Damien George Date: Tue, 14 Jan 2025 15:16:36 +1100 Subject: [PATCH] qemu/boards: Change boards to use a subdirectory like other ports. This commit moves `.mk` to `/mpconfigboard.mk` for all qemu boards, making it the same as other bare-metal ports. Signed-off-by: Damien George --- ports/qemu/Makefile | 7 ++++++- .../qemu/boards/{MICROBIT.mk => MICROBIT/mpconfigboard.mk} | 0 .../boards/{MPS2_AN385.mk => MPS2_AN385/mpconfigboard.mk} | 0 .../boards/{NETDUINO2.mk => NETDUINO2/mpconfigboard.mk} | 0 .../boards/{SABRELITE.mk => SABRELITE/mpconfigboard.mk} | 0 .../boards/{VIRT_RV32.mk => VIRT_RV32/mpconfigboard.mk} | 0 6 files changed, 6 insertions(+), 1 deletion(-) rename ports/qemu/boards/{MICROBIT.mk => MICROBIT/mpconfigboard.mk} (100%) rename ports/qemu/boards/{MPS2_AN385.mk => MPS2_AN385/mpconfigboard.mk} (100%) rename ports/qemu/boards/{NETDUINO2.mk => NETDUINO2/mpconfigboard.mk} (100%) rename ports/qemu/boards/{SABRELITE.mk => SABRELITE/mpconfigboard.mk} (100%) rename ports/qemu/boards/{VIRT_RV32.mk => VIRT_RV32/mpconfigboard.mk} (100%) 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 similarity index 100% rename from ports/qemu/boards/MICROBIT.mk rename to ports/qemu/boards/MICROBIT/mpconfigboard.mk diff --git a/ports/qemu/boards/MPS2_AN385.mk b/ports/qemu/boards/MPS2_AN385/mpconfigboard.mk similarity index 100% rename from ports/qemu/boards/MPS2_AN385.mk rename to ports/qemu/boards/MPS2_AN385/mpconfigboard.mk diff --git a/ports/qemu/boards/NETDUINO2.mk b/ports/qemu/boards/NETDUINO2/mpconfigboard.mk similarity index 100% rename from ports/qemu/boards/NETDUINO2.mk rename to ports/qemu/boards/NETDUINO2/mpconfigboard.mk diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE/mpconfigboard.mk similarity index 100% rename from ports/qemu/boards/SABRELITE.mk rename to ports/qemu/boards/SABRELITE/mpconfigboard.mk diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32/mpconfigboard.mk similarity index 100% rename from ports/qemu/boards/VIRT_RV32.mk rename to ports/qemu/boards/VIRT_RV32/mpconfigboard.mk