diff options
| author |   Masahiro Yamada <masahiroy@kernel.org> | 2024-12-22 09:32:07 +0900 |
|---|---|---|
| committer |   John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> | 2025-02-01 10:43:18 +0100 |
| commit | 21bcc49974c2a45c6c5e8e5e500ce6642e4328f1 (patch) | |
| tree | dd4748be3ce271e6cccf2b7f43beef29d7bc001e /arch/sh/kernel | |
| parent | sh: irq: Use seq_put_decimal_ull_width() for decimal values (diff) | |
| download | wireguard-linux-21bcc49974c2a45c6c5e8e5e500ce6642e4328f1.tar.xz wireguard-linux-21bcc49974c2a45c6c5e8e5e500ce6642e4328f1.zip | |
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>
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index f2b6f16a46b8..039a51291002 100644 --- 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(); |