linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -fixes] riscv: Fix BUILTIN_DTB for sifive and microchip soc
@ 2021-06-04 12:06 Alexandre Ghiti
  2021-06-04 13:08 ` Arnd Bergmann
  0 siblings, 1 reply; 10+ messages in thread
From: Alexandre Ghiti @ 2021-06-04 12:06 UTC (permalink / raw)
  To: Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	devicetree, linux-riscv, linux-kernel
  Cc: Alexandre Ghiti

Fix BUILTIN_DTB config which resulted in a dtb that was actually not built
into the Linux image: in the same manner as Canaan soc does, create an object
file from the dtb file that will get linked into the Linux image.

Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
---
 arch/riscv/boot/dts/microchip/Makefile | 1 +
 arch/riscv/boot/dts/sifive/Makefile    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/riscv/boot/dts/microchip/Makefile b/arch/riscv/boot/dts/microchip/Makefile
index 622b12771fd3..855c1502d912 100644
--- a/arch/riscv/boot/dts/microchip/Makefile
+++ b/arch/riscv/boot/dts/microchip/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += microchip-mpfs-icicle-kit.dtb
+obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
diff --git a/arch/riscv/boot/dts/sifive/Makefile b/arch/riscv/boot/dts/sifive/Makefile
index 74c47fe9fc22..d90e4eb0ade8 100644
--- a/arch/riscv/boot/dts/sifive/Makefile
+++ b/arch/riscv/boot/dts/sifive/Makefile
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_SOC_SIFIVE) += hifive-unleashed-a00.dtb \
 			    hifive-unmatched-a00.dtb
+obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-06-12  4:12 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-04 12:06 [PATCH -fixes] riscv: Fix BUILTIN_DTB for sifive and microchip soc Alexandre Ghiti
2021-06-04 13:08 ` Arnd Bergmann
2021-06-04 15:51   ` Palmer Dabbelt
2021-06-04 18:34     ` Arnd Bergmann
2021-06-04 17:45   ` Vitaly Wool
2021-06-04 18:33     ` Arnd Bergmann
2021-06-05  6:33   ` Alex Ghiti
2021-06-05 11:00     ` Arnd Bergmann
2021-06-06  7:40       ` Alex Ghiti
2021-06-12  4:10         ` Palmer Dabbelt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).