From: Masahiro Yamada Date: Sat, 25 Jan 2025 10:51:33 +0000 (+0800) Subject: LoongArch: Migrate to the generic rule for built-in DTB X-Git-Tag: v6.14-rc1~61^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c91ddab5799109124ccdfa88fd381c613a766a89;p=thirdparty%2Fkernel%2Flinux.git 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. Signed-off-by: Masahiro Yamada Signed-off-by: Huacai Chen --- diff --git a/arch/loongarch/Kbuild b/arch/loongarch/Kbuild index bfa21465d83af..beb8499dd8ed8 100644 --- a/arch/loongarch/Kbuild +++ b/arch/loongarch/Kbuild @@ -4,7 +4,6 @@ obj-y += net/ obj-y += vdso/ obj-$(CONFIG_KVM) += kvm/ -obj-$(CONFIG_BUILTIN_DTB) += boot/dts/ # for cleaning subdir- += boot diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index dae3a9104ca65..98e099be912db 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -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 diff --git a/arch/loongarch/boot/dts/Makefile b/arch/loongarch/boot/dts/Makefile index 747d0c3f63892..15d5e14fe4184 100644 --- a/arch/loongarch/boot/dts/Makefile +++ b/arch/loongarch/boot/dts/Makefile @@ -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))