Commit 134502ab authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Stafford Horne
Browse files

openrisc: 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 to use the generic rule.

To keep consistency across architectures, this commit also renames
CONFIG_OPENRISC_BUILTIN_DTB_NAME to CONFIG_BUILTIN_DTB_NAME.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
parent fc033cf2

arch/openrisc/Kbuild

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y += lib/ kernel/ mm/

obj-y += boot/dts/



# for cleaning

subdir- += boot

arch/openrisc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config OPENRISC 
	select ARCH_HAS_DMA_SET_UNCACHED

	select ARCH_HAS_DMA_CLEAR_UNCACHED

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select GENERIC_BUILTIN_DTB

	select COMMON_CLK

	select OF

	select OF_EARLY_FLATTREE
@@ -92,7 +93,7 @@ config DCACHE_WRITETHROUGH 


	  If unsure say N here



config OPENRISC_BUILTIN_DTB

config BUILTIN_DTB_NAME

	string "Builtin DTB"

	default ""

arch/openrisc/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y += $(addsuffix .dtb.o, $(CONFIG_OPENRISC_BUILTIN_DTB))

dtb-y += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME))



#DTC_FLAGS ?= -p 1024

arch/openrisc/configs/or1klitex_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SGETMASK_SYSCALL=y

CONFIG_EXPERT=y

CONFIG_OPENRISC_BUILTIN_DTB="or1klitex"

CONFIG_BUILTIN_DTB_NAME="or1klitex"

CONFIG_HZ_100=y

CONFIG_OPENRISC_HAVE_SHADOW_GPRS=y

CONFIG_NET=y

arch/openrisc/configs/or1ksim_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ CONFIG_SLUB=y 
CONFIG_SLUB_TINY=y

CONFIG_MODULES=y

# CONFIG_BLOCK is not set

CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"

CONFIG_BUILTIN_DTB_NAME="or1ksim"

CONFIG_HZ_100=y

CONFIG_NET=y

CONFIG_PACKET=y