Unverified Commit 82e81b89 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Alexandre Ghiti
Browse files

riscv: 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_BUILTIN_DTB_SOURCE to CONFIG_BUILTIN_DTB_NAME.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20241222000836.2578171-1-masahiroy@kernel.org


Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
parent bba54781

arch/riscv/Kbuild

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



obj-y += kernel/ mm/ net/

obj-$(CONFIG_BUILTIN_DTB) += boot/dts/

obj-$(CONFIG_CRYPTO) += crypto/

obj-y += errata/

obj-$(CONFIG_KVM) += kvm/

arch/riscv/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1272,13 +1272,14 @@ config RISCV_ISA_FALLBACK 
config BUILTIN_DTB

	bool "Built-in device tree"

	depends on OF && NONPORTABLE

	select GENERIC_BUILTIN_DTB

	help

	  Build a device tree into the Linux image.

	  This option should be selected if no bootloader is being used.

	  If unsure, say N.





config BUILTIN_DTB_SOURCE

config BUILTIN_DTB_NAME

	string "Built-in device tree source"

	depends on BUILTIN_DTB

	help

arch/riscv/boot/dts/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -8,5 +8,3 @@ subdir-y += sophgo 
subdir-y += spacemit

subdir-y += starfive

subdir-y += thead
 


obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE))

arch/riscv/configs/nommu_k210_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ CONFIG_NR_CPUS=2 
CONFIG_CMDLINE="earlycon console=ttySIF0"

CONFIG_CMDLINE_FORCE=y

CONFIG_BUILTIN_DTB=y

CONFIG_BUILTIN_DTB_SOURCE="canaan/k210_generic"

CONFIG_BUILTIN_DTB_NAME="canaan/k210_generic"

# CONFIG_SECCOMP is not set

# CONFIG_STACKPROTECTOR is not set

# CONFIG_GCC_PLUGINS is not set

arch/riscv/configs/nommu_k210_sdcard_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ CONFIG_NR_CPUS=2 
CONFIG_CMDLINE="earlycon console=ttySIF0 root=/dev/mmcblk0p1 rootwait ro"

CONFIG_CMDLINE_FORCE=y

CONFIG_BUILTIN_DTB=y

CONFIG_BUILTIN_DTB_SOURCE="canaan/k210_generic"

CONFIG_BUILTIN_DTB_NAME="canaan/k210_generic"

# CONFIG_SECCOMP is not set

# CONFIG_STACKPROTECTOR is not set

# CONFIG_GCC_PLUGINS is not set