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

Configure Feed

Select the types of activity you want to include in your feed.

ARC: 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_ARC_BUILTIN_DTB_NAME to CONFIG_BUILTIN_DTB_NAME.

Now, "nsim_700" is the default value for CONFIG_BUILTIN_DTB_NAME, rather
than a fallback in case it is empty.

Acked-by: Vineet Gupta <vgupta@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Masahiro Yamada 3b7f793a ac61506b

+18 -27
+4 -3
arch/arc/Kconfig
··· 18 18 select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC 19 19 select ARCH_32BIT_OFF_T 20 20 select BUILDTIME_TABLE_SORT 21 + select GENERIC_BUILTIN_DTB 21 22 select CLONE_BACKWARDS 22 23 select COMMON_CLK 23 24 select DMA_DIRECT_REMAP ··· 552 551 part of static keys (jump labels) related code. 553 552 endif 554 553 555 - config ARC_BUILTIN_DTB_NAME 554 + config BUILTIN_DTB_NAME 556 555 string "Built in DTB" 556 + default "nsim_700" 557 557 help 558 - Set the name of the DTB to embed in the vmlinux binary 559 - Leaving it blank selects the "nsim_700" dtb. 558 + Set the name of the DTB to embed in the vmlinux binary. 560 559 561 560 endmenu # "ARC Architecture Configuration" 562 561
-3
arch/arc/Makefile
··· 82 82 KBUILD_AFLAGS += $(KBUILD_CFLAGS) 83 83 KBUILD_LDFLAGS += $(ldflags-y) 84 84 85 - # w/o this dtb won't embed into kernel binary 86 - core-y += arch/arc/boot/dts/ 87 - 88 85 core-y += arch/arc/plat-sim/ 89 86 core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/ 90 87 core-$(CONFIG_ARC_PLAT_AXS10X) += arch/arc/plat-axs10x/
+1 -8
arch/arc/boot/dts/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - # Built-in dtb 3 - builtindtb-y := nsim_700 4 2 5 - ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),) 6 - builtindtb-y := $(CONFIG_ARC_BUILTIN_DTB_NAME) 7 - endif 8 - 9 - obj-y += $(builtindtb-y).dtb.o 10 - dtb-y := $(builtindtb-y).dtb 3 + dtb-y := $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME)) 11 4 12 5 # for CONFIG_OF_ALL_DTBS test 13 6 dtb- := $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts))
+1 -1
arch/arc/configs/axs101_defconfig
··· 23 23 CONFIG_ARC_PLAT_AXS10X=y 24 24 CONFIG_AXS101=y 25 25 CONFIG_ARC_CACHE_LINE_SHIFT=5 26 - CONFIG_ARC_BUILTIN_DTB_NAME="axs101" 26 + CONFIG_BUILTIN_DTB_NAME="axs101" 27 27 CONFIG_PREEMPT=y 28 28 # CONFIG_COMPACTION is not set 29 29 CONFIG_NET=y
+1 -1
arch/arc/configs/axs103_defconfig
··· 22 22 CONFIG_ARC_PLAT_AXS10X=y 23 23 CONFIG_AXS103=y 24 24 CONFIG_ISA_ARCV2=y 25 - CONFIG_ARC_BUILTIN_DTB_NAME="axs103" 25 + CONFIG_BUILTIN_DTB_NAME="axs103" 26 26 CONFIG_PREEMPT=y 27 27 # CONFIG_COMPACTION is not set 28 28 CONFIG_NET=y
+1 -1
arch/arc/configs/axs103_smp_defconfig
··· 22 22 CONFIG_AXS103=y 23 23 CONFIG_ISA_ARCV2=y 24 24 CONFIG_SMP=y 25 - CONFIG_ARC_BUILTIN_DTB_NAME="axs103_idu" 25 + CONFIG_BUILTIN_DTB_NAME="axs103_idu" 26 26 CONFIG_PREEMPT=y 27 27 # CONFIG_COMPACTION is not set 28 28 CONFIG_NET=y
+1 -1
arch/arc/configs/haps_hs_defconfig
··· 14 14 CONFIG_EXPERT=y 15 15 CONFIG_PERF_EVENTS=y 16 16 # CONFIG_COMPAT_BRK is not set 17 - CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs" 17 + CONFIG_BUILTIN_DTB_NAME="haps_hs" 18 18 CONFIG_MODULES=y 19 19 # CONFIG_BLK_DEV_BSG is not set 20 20 # CONFIG_COMPACTION is not set
+1 -1
arch/arc/configs/haps_hs_smp_defconfig
··· 16 16 # CONFIG_VM_EVENT_COUNTERS is not set 17 17 # CONFIG_COMPAT_BRK is not set 18 18 CONFIG_SMP=y 19 - CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs_idu" 19 + CONFIG_BUILTIN_DTB_NAME="haps_hs_idu" 20 20 CONFIG_KPROBES=y 21 21 CONFIG_MODULES=y 22 22 # CONFIG_BLK_DEV_BSG is not set
+1 -1
arch/arc/configs/hsdk_defconfig
··· 20 20 CONFIG_SMP=y 21 21 CONFIG_LINUX_LINK_BASE=0x90000000 22 22 CONFIG_LINUX_RAM_BASE=0x80000000 23 - CONFIG_ARC_BUILTIN_DTB_NAME="hsdk" 23 + CONFIG_BUILTIN_DTB_NAME="hsdk" 24 24 CONFIG_PREEMPT=y 25 25 # CONFIG_COMPACTION is not set 26 26 CONFIG_NET=y
+1 -1
arch/arc/configs/nsim_700_defconfig
··· 17 17 # CONFIG_SLUB_DEBUG is not set 18 18 # CONFIG_COMPAT_BRK is not set 19 19 CONFIG_ISA_ARCOMPACT=y 20 - CONFIG_ARC_BUILTIN_DTB_NAME="nsim_700" 20 + CONFIG_BUILTIN_DTB_NAME="nsim_700" 21 21 CONFIG_KPROBES=y 22 22 CONFIG_MODULES=y 23 23 # CONFIG_BLK_DEV_BSG is not set
+1 -1
arch/arc/configs/nsimosci_defconfig
··· 19 19 CONFIG_KPROBES=y 20 20 CONFIG_MODULES=y 21 21 # CONFIG_BLK_DEV_BSG is not set 22 - CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci" 22 + CONFIG_BUILTIN_DTB_NAME="nsimosci" 23 23 # CONFIG_COMPACTION is not set 24 24 CONFIG_NET=y 25 25 CONFIG_PACKET=y
+1 -1
arch/arc/configs/nsimosci_hs_defconfig
··· 19 19 CONFIG_MODULES=y 20 20 # CONFIG_BLK_DEV_BSG is not set 21 21 CONFIG_ISA_ARCV2=y 22 - CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci_hs" 22 + CONFIG_BUILTIN_DTB_NAME="nsimosci_hs" 23 23 # CONFIG_COMPACTION is not set 24 24 CONFIG_NET=y 25 25 CONFIG_PACKET=y
+1 -1
arch/arc/configs/nsimosci_hs_smp_defconfig
··· 16 16 CONFIG_ISA_ARCV2=y 17 17 CONFIG_SMP=y 18 18 # CONFIG_ARC_TIMERS_64BIT is not set 19 - CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci_hs_idu" 19 + CONFIG_BUILTIN_DTB_NAME="nsimosci_hs_idu" 20 20 CONFIG_PREEMPT=y 21 21 # CONFIG_COMPACTION is not set 22 22 CONFIG_NET=y
+1 -1
arch/arc/configs/tb10x_defconfig
··· 26 26 CONFIG_ARC_PLAT_TB10X=y 27 27 CONFIG_ARC_CACHE_LINE_SHIFT=5 28 28 CONFIG_HZ=250 29 - CONFIG_ARC_BUILTIN_DTB_NAME="abilis_tb100_dvk" 29 + CONFIG_BUILTIN_DTB_NAME="abilis_tb100_dvk" 30 30 CONFIG_PREEMPT_VOLUNTARY=y 31 31 # CONFIG_COMPACTION is not set 32 32 CONFIG_NET=y
+1 -1
arch/arc/configs/vdk_hs38_defconfig
··· 13 13 CONFIG_ARC_PLAT_AXS10X=y 14 14 CONFIG_AXS103=y 15 15 CONFIG_ISA_ARCV2=y 16 - CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38" 16 + CONFIG_BUILTIN_DTB_NAME="vdk_hs38" 17 17 CONFIG_PREEMPT=y 18 18 CONFIG_NET=y 19 19 CONFIG_PACKET=y
+1 -1
arch/arc/configs/vdk_hs38_smp_defconfig
··· 15 15 CONFIG_ISA_ARCV2=y 16 16 CONFIG_SMP=y 17 17 # CONFIG_ARC_TIMERS_64BIT is not set 18 - CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp" 18 + CONFIG_BUILTIN_DTB_NAME="vdk_hs38_smp" 19 19 CONFIG_PREEMPT=y 20 20 CONFIG_NET=y 21 21 CONFIG_PACKET=y