sh: 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.

To keep consistency across architectures, this commit also renames
CONFIG_USE_BUILTIN_DTB to CONFIG_BUILTIN_DTB, and
CONFIG_BUILTIN_DTB_SOURCE to CONFIG_BUILTIN_DTB_NAME.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

diff --git a/arch/sh/Kbuild b/arch/sh/Kbuild
index 056efec72c2a0b1157d6d536924bdedf416c3f4b..0da6c6d6821adfeb267915683f33f860dc6789b3 100644 (file)
--- a/arch/sh/Kbuild
+++ b/arch/sh/Kbuild
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-y                          += kernel/ mm/ boards/
 obj-$(CONFIG_SH_FPU_EMU)       += math-emu/
-obj-$(CONFIG_USE_BUILTIN_DTB)  += boot/dts/
 
 obj-$(CONFIG_HD6446X_SERIES)   += cchips/hd6446x/
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 04ff5fb9242edd2babc4737ade679fa4ae11e86d..89185af7bcc98ca6558879766f20d89f0d7a403c 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -648,10 +648,11 @@ endmenu
 
 menu "Boot options"
 
-config USE_BUILTIN_DTB
+config BUILTIN_DTB
        bool "Use builtin DTB"
        default n
        depends on SH_DEVICE_TREE
+       select GENERIC_BUILTIN_DTB
        help
          Link a device tree blob for particular hardware into the kernel,
          suppressing use of the DTB pointer provided by the bootloader.
@@ -659,10 +660,10 @@ config USE_BUILTIN_DTB
          not capable of providing a DTB to the kernel, or for experimental
          hardware without stable device tree bindings.
 
-config BUILTIN_DTB_SOURCE
+config BUILTIN_DTB_NAME
        string "Source file for builtin DTB"
        default ""
-       depends on USE_BUILTIN_DTB
+       depends on BUILTIN_DTB
        help
          Base name (without suffix, relative to arch/sh/boot/dts) for the
          a DTS file that will be used to produce the DTB linked into the

diff --git a/arch/sh/boot/dts/Makefile b/arch/sh/boot/dts/Makefile
index 4a6dec9714a9e2a49301bf8bb519ed0123a89e49..d109978a5eb9c46602c84eaf999c25ca649cf47d 100644 (file)
--- a/arch/sh/boot/dts/Makefile
+++ b/arch/sh/boot/dts/Makefile
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_USE_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE))
+obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index f2b6f16a46b85daa328f3af2b532e537705bfe47..039a51291002bc0a0313b5705fbf49aee2f3b437 100644 (file)
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -249,7 +249,7 @@ void __ref sh_fdt_init(phys_addr_t dt_phys)
        /* Avoid calling an __init function on secondary cpus. */
        if (done) return;
 
-#ifdef CONFIG_USE_BUILTIN_DTB
+#ifdef CONFIG_BUILTIN_DTB
        dt_virt = __dtb_start;
 #else
        dt_virt = phys_to_virt(dt_phys);
@@ -323,7 +323,7 @@ void __init setup_arch(char **cmdline_p)
        sh_early_platform_driver_probe("earlyprintk", 1, 1);
 
 #ifdef CONFIG_OF_EARLY_FLATTREE
-#ifdef CONFIG_USE_BUILTIN_DTB
+#ifdef CONFIG_BUILTIN_DTB
        unflatten_and_copy_device_tree();
 #else
        unflatten_device_tree();