[PATCH master 2/3] RISC-V: riscvemu: build overlay as DTSO

[Ahmad Fatoum]

Overlay files shouldn't include the device tree snippets from
CONFIG_EXTERNAL_DTS_FRAGMENTS, which is avoided by using the dtbo rule
instead of the dtb rule that we were using before.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 arch/riscv/boards/riscvemu/Makefile                           | 2 +-
 arch/riscv/boards/riscvemu/board.c                            | 4 ++--
 .../riscvemu/{overlay-of-sram.dts => riscvemu-sram.dtso}      | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/riscv/boards/riscvemu/{overlay-of-sram.dts => riscvemu-sram.dtso} (100%)

diff --git a/arch/riscv/boards/riscvemu/Makefile b/arch/riscv/boards/riscvemu/Makefile
index ec7e89479e77..baada2136ee2 100644
--- a/arch/riscv/boards/riscvemu/Makefile
+++ b/arch/riscv/boards/riscvemu/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 obj-y += board.o
-obj-y += overlay-of-sram.dtb.o
+obj-y += riscvemu-sram.dtbo.o
 bbenv-$(CONFIG_CMD_TUTORIAL) += defaultenv-riscvemu
 
 clean-files := *.dtb *.dtb.S .*.dtc .*.pre .*.dts *.dtb.z
diff --git a/arch/riscv/boards/riscvemu/board.c b/arch/riscv/boards/riscvemu/board.c
index c1d008ab5d32..afd6608ac522 100644
--- a/arch/riscv/boards/riscvemu/board.c
+++ b/arch/riscv/boards/riscvemu/board.c
@@ -33,7 +33,7 @@ static void __noreturn riscvemu_restart(struct restart_handler *rst)
 	priv->restart(riscv_hartid(), barebox_riscv_boot_dtb());
 }
 
-extern char __dtb_overlay_of_sram_start[];
+extern char __dtbo_riscvemu_sram_start[];
 
 static int riscvemu_probe(struct device *dev)
 {
@@ -42,7 +42,7 @@ static int riscvemu_probe(struct device *dev)
 	struct riscvemu_priv *priv;
 	u64 start;
 
-	overlay = of_unflatten_dtb(__dtb_overlay_of_sram_start, INT_MAX);
+	overlay = of_unflatten_dtb(__dtbo_riscvemu_sram_start, INT_MAX);
 	of_overlay_apply_tree(dev->of_node, overlay);
 	/* of_probe() will happen later at of_populate_initcall */
 
diff --git a/arch/riscv/boards/riscvemu/overlay-of-sram.dts b/arch/riscv/boards/riscvemu/riscvemu-sram.dtso
similarity index 100%
rename from arch/riscv/boards/riscvemu/overlay-of-sram.dts
rename to arch/riscv/boards/riscvemu/riscvemu-sram.dtso
-- 
2.39.2