riscv: migrate to the generic rule for built-in DTB
Subsystems (2)
PATCH 1/1 riscv: 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_BUILTIN_DTB_SOURCE to CONFIG_BUILTIN_DTB_NAME.
---
arch/riscv/Kbuild | 1 - arch/riscv/Kconfig | 3 ++- arch/riscv/boot/dts/Makefile | 2 -- arch/riscv/configs/nommu_k210_defconfig | 2 +- arch/riscv/configs/nommu_k210_sdcard_defconfig | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-)
arch/riscv/Kbuild +0 -1
@@ -1,7 +1,6 @@ # 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
@@ -1267,13 +1267,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
@@ -7,5 +7,3 @@ subdir-y += sifive subdir-y += sophgo 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
@@ -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
@@ -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
Signature · 1 line
2.43.0
Quoted 4 lines · Masahiro Yamada
Commit
654102df2ac2("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.
Quoted 8 lines
Select
GENERIC_BUILTIN_DTBwhen built-in DTB support is enabled.To keep consistency across architectures, this commit also renames
CONFIG_BUILTIN_DTB_SOURCEtoCONFIG_BUILTIN_DTB_NAME.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Conor Dooley <[email protected]>---
Ping?
Signature · 2 lines
Best Regards Masahiro Yamada
Alexandre Ghiti
reviewerHi Masahiro,
Quoted 6 lines · Masahiro Yamada
Quoted 5 lines · Masahiro Yamada
Commit
654102df2ac2("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.Select
GENERIC_BUILTIN_DTBwhen built-in DTB support is enabled.
Quoted 7 lines
Quoted 6 lines
To keep consistency across architectures, this commit also renames
CONFIG_BUILTIN_DTB_SOURCEtoCONFIG_BUILTIN_DTB_NAME.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Conor Dooley <[email protected]>---
Ping?
It is on my list for 6.15 and *should* be merged.
Thanks,
Alex
Quoted 2 lines
This patch was applied to riscv/linux.git (for-next) by Alexandre Ghiti <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (for-next) by Alexandre Ghiti <[email protected]>:
Quoted 9 lines · On Sun, 22 Dec 2024 09:08:25 +0900 you wrote:
Commit
654102df2ac2("kbuild: add generic support for built-in boot DTBs") introduced generic support for built-in DTBs.Select
GENERIC_BUILTIN_DTBwhen built-in DTB support is enabled.To keep consistency across architectures, this commit also renames
CONFIG_BUILTIN_DTB_SOURCEtoCONFIG_BUILTIN_DTB_NAME.[...]
Here is the summary with links:
- riscv: migrate to the generic rule for built-in DTB
https://git.kernel.org/riscv/c/82e81b89501a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html