From 218cf5ccdbbff8bc98baba23d4d0cb439b6db480 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 19 Nov 2025 16:42:44 +0100 Subject: [PATCH] board: Defer Makefile fragment inclusion to each architecture The board/*/*/*.mk is very broad, intended to hit all board specific definitions, but may also cause duplicate inclusions, e.g., in board/common. Let each architecture do the inclusion instead. --- board/aarch64/board.mk | 1 + board/board.mk | 3 ++- board/riscv64/board.mk | 1 + external.mk | 2 -- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 board/riscv64/board.mk diff --git a/board/aarch64/board.mk b/board/aarch64/board.mk index d825ceb7..9b6c82a9 100644 --- a/board/aarch64/board.mk +++ b/board/aarch64/board.mk @@ -1,3 +1,4 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/*/*.mk)) .PHONY: board-enable-qemu-uboot board-enable-qemu-uboot: diff --git a/board/board.mk b/board/board.mk index a87a8715..8208e16f 100644 --- a/board/board.mk +++ b/board/board.mk @@ -1,2 +1,3 @@ +include $(BR2_EXTERNAL_INFIX_PATH)/board/common/common.mk include $(BR2_EXTERNAL_INFIX_PATH)/board/ix-board.mk -include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/*/*/*.mk)) +-include $(BR2_EXTERNAL_INFIX_PATH)/board/$(patsubst "%",%,$(BR2_ARCH))/board.mk diff --git a/board/riscv64/board.mk b/board/riscv64/board.mk new file mode 100644 index 00000000..87bae895 --- /dev/null +++ b/board/riscv64/board.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/riscv64/*/*.mk)) diff --git a/external.mk b/external.mk index 2a4a4874..54fdd6e4 100644 --- a/external.mk +++ b/external.mk @@ -1,8 +1,6 @@ include $(BR2_EXTERNAL_INFIX_PATH)/infix.mk include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/package/*/*.mk)) -include $(BR2_EXTERNAL_INFIX_PATH)/board/common/common.mk include $(BR2_EXTERNAL_INFIX_PATH)/board/board.mk --include $(BR2_EXTERNAL_INFIX_PATH)/board/$(patsubst "%",%,$(BR2_ARCH))/board.mk include $(BR2_EXTERNAL_INFIX_PATH)/test/test.mk .PHONY: local.mk