Commit 21bcc499 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by John Paul Adrian Glaubitz
Browse files

sh: Migrate to the generic rule for built-in DTB 



Commit 654102df ("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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
parent d2a5f10b

arch/sh/Kbuild

+0 −1
Original line number Diff line number Diff line 
# 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/

arch/sh/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -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

arch/sh/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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))

arch/sh/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -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();