From: Ahmad Fatoum <ahmad@xxxxxx>
Build system now differentiates between building normal device trees and
overlays; as the latter would be broken when CONFIG_EXTERNAL_DTS_FRAGMENTS
is in use. Switch over Qemu board support to build the overlay as such.
Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx>
---
common/boards/qemu-virt/Makefile | 2 +-
common/boards/qemu-virt/board.c | 4 ++--
common/boards/qemu-virt/{overlay-of-flash.dts => flash.dtso} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename common/boards/qemu-virt/{overlay-of-flash.dts => flash.dtso} (100%)
diff --git a/common/boards/qemu-virt/Makefile b/common/boards/qemu-virt/Makefile
index 88184e9a7969..53f00d1b0c41 100644
--- a/common/boards/qemu-virt/Makefile
+++ b/common/boards/qemu-virt/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += board.o
-obj-y += overlay-of-flash.dtb.o
+obj-y += flash.dtbo.o
ifeq ($(CONFIG_RISCV),y)
DTC_CPP_FLAGS_overlay-of-flash.dtb := -DRISCV_VIRT=1
endif
diff --git a/common/boards/qemu-virt/board.c b/common/boards/qemu-virt/board.c
index 7e0e63333c5c..89d103493179 100644
--- a/common/boards/qemu-virt/board.c
+++ b/common/boards/qemu-virt/board.c
@@ -34,7 +34,7 @@ static inline void arm_virt_init(void)
static inline void arm_virt_init(void) {}
#endif
-extern char __dtb_overlay_of_flash_start[];
+extern char __dtbo_flash_start[];
static const struct of_device_id virt_of_match[] = {
{ .compatible = "linux,dummy-virt", .data = arm_virt_init },
@@ -62,7 +62,7 @@ static int virt_board_driver_init(void)
init();
}
- overlay = of_unflatten_dtb(__dtb_overlay_of_flash_start, INT_MAX);
+ overlay = of_unflatten_dtb(__dtbo_flash_start, INT_MAX);
of_overlay_apply_tree(root, overlay);
/* of_probe() will happen later at of_populate_initcall */
diff --git a/common/boards/qemu-virt/overlay-of-flash.dts b/common/boards/qemu-virt/flash.dtso
similarity index 100%
rename from common/boards/qemu-virt/overlay-of-flash.dts
rename to common/boards/qemu-virt/flash.dtso
--
2.30.2
