Skip to contentSkip to conversation

LoongArch: migrate to the generic rule for built-in DTB

PATCH Applied Masahiro Yamada 2 participants 2 messages Dec 22, 2024 – Jan 1, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 LoongArch: migrate to the generic rule for built-in DTB

Commit 654102df2ac2 ("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.

Select GENERIC_BUILTIN_DTB when built-in DTB support is enabled.

---

 arch/loongarch/Kbuild            | 1 -
 arch/loongarch/Kconfig           | 1 +
 arch/loongarch/boot/dts/Makefile | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)
arch/loongarch/Kbuild +0 -1
index bfa21465d83a..beb8499dd8ed 100644
@@ -4,7 +4,6 @@ obj-y += net/
 obj-y += vdso/
 
 obj-$(CONFIG_KVM) += kvm/
-obj-$(CONFIG_BUILTIN_DTB) += boot/dts/
 
 # for cleaning
 subdir- += boot
arch/loongarch/Kconfig +1 -0
index dae3a9104ca6..98e099be912d 100644
@@ -396,6 +396,7 @@ endchoice
 config BUILTIN_DTB
 	bool "Enable built-in dtb in kernel"
 	depends on OF
+	select GENERIC_BUILTIN_DTB
 	help
 	  Some existing systems do not provide a canonical device tree to
 	  the kernel at boot time. Let's provide a device tree table in the
arch/loongarch/boot/dts/Makefile +0 -2
index 747d0c3f6389..15d5e14fe418 100644
@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 dtb-y = loongson-2k0500-ref.dtb loongson-2k1000-ref.dtb loongson-2k2000-ref.dtb
-
-obj-$(CONFIG_BUILTIN_DTB)	+= $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))
Signature · 1 line
2.43.0
maintainer Applied
#1 lore raw

Queued, thanks.

Huacai

Quoted 51 lines · Masahiro Yamada

Commit 654102df2ac2 ("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.

Select GENERIC_BUILTIN_DTB when built-in DTB support is enabled.

---

 arch/loongarch/Kbuild            | 1 -
 arch/loongarch/Kconfig           | 1 +
 arch/loongarch/boot/dts/Makefile | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)
arch/loongarch/Kbuild +0 -1
index bfa21465d83a..beb8499dd8ed 100644
@@ -4,7 +4,6 @@ obj-y += net/
 obj-y += vdso/
 
 obj-$(CONFIG_KVM) += kvm/
-obj-$(CONFIG_BUILTIN_DTB) += boot/dts/
 
 # for cleaning
 subdir- += boot
arch/loongarch/Kconfig +1 -0
index dae3a9104ca6..98e099be912d 100644
@@ -396,6 +396,7 @@ endchoice
 config BUILTIN_DTB
        bool "Enable built-in dtb in kernel"
        depends on OF
+       select GENERIC_BUILTIN_DTB
        help
          Some existing systems do not provide a canonical device tree to
          the kernel at boot time. Let's provide a device tree table in the
arch/loongarch/boot/dts/Makefile +0 -3
index 747d0c3f6389..15d5e14fe418 100644
@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 dtb-y = loongson-2k0500-ref.dtb loongson-2k1000-ref.dtb loongson-2k2000-ref.dtb
-
-obj-$(CONFIG_BUILTIN_DTB)      += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))
--

2.43.0