Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

openrisc: 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 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: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Stafford Horne <shorne@gmail.com>

authored by

Masahiro Yamada and committed by
Stafford Horne
134502ab fc033cf2

+6 -6
-1
arch/openrisc/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 obj-y += lib/ kernel/ mm/ 3 - obj-y += boot/dts/ 4 3 5 4 # for cleaning 6 5 subdir- += boot
+2 -1
arch/openrisc/Kconfig
··· 10 10 select ARCH_HAS_DMA_SET_UNCACHED 11 11 select ARCH_HAS_DMA_CLEAR_UNCACHED 12 12 select ARCH_HAS_SYNC_DMA_FOR_DEVICE 13 + select GENERIC_BUILTIN_DTB 13 14 select COMMON_CLK 14 15 select OF 15 16 select OF_EARLY_FLATTREE ··· 93 92 94 93 If unsure say N here 95 94 96 - config OPENRISC_BUILTIN_DTB 95 + config BUILTIN_DTB_NAME 97 96 string "Builtin DTB" 98 97 default "" 99 98
+1 -1
arch/openrisc/boot/dts/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - obj-y += $(addsuffix .dtb.o, $(CONFIG_OPENRISC_BUILTIN_DTB)) 2 + dtb-y += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME)) 3 3 4 4 #DTC_FLAGS ?= -p 1024
+1 -1
arch/openrisc/configs/or1klitex_defconfig
··· 7 7 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 8 8 CONFIG_SGETMASK_SYSCALL=y 9 9 CONFIG_EXPERT=y 10 - CONFIG_OPENRISC_BUILTIN_DTB="or1klitex" 10 + CONFIG_BUILTIN_DTB_NAME="or1klitex" 11 11 CONFIG_HZ_100=y 12 12 CONFIG_OPENRISC_HAVE_SHADOW_GPRS=y 13 13 CONFIG_NET=y
+1 -1
arch/openrisc/configs/or1ksim_defconfig
··· 14 14 CONFIG_SLUB_TINY=y 15 15 CONFIG_MODULES=y 16 16 # CONFIG_BLOCK is not set 17 - CONFIG_OPENRISC_BUILTIN_DTB="or1ksim" 17 + CONFIG_BUILTIN_DTB_NAME="or1ksim" 18 18 CONFIG_HZ_100=y 19 19 CONFIG_NET=y 20 20 CONFIG_PACKET=y
+1 -1
arch/openrisc/configs/simple_smp_defconfig
··· 20 20 CONFIG_SLUB_TINY=y 21 21 CONFIG_MODULES=y 22 22 # CONFIG_BLOCK is not set 23 - CONFIG_OPENRISC_BUILTIN_DTB="simple_smp" 23 + CONFIG_BUILTIN_DTB_NAME="simple_smp" 24 24 CONFIG_SMP=y 25 25 CONFIG_HZ_100=y 26 26 CONFIG_OPENRISC_HAVE_SHADOW_GPRS=y