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