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

kbuild: defconf: use SRCARCH to find merged configs

For some ARCH values, SRCARCH, which should be used for finding arch/
subdirectory, is different from ARCH.

Signed-off-by: Zhang Bingwu <xtexchooser@duck.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

authored by

Zhang Bingwu and committed by
Masahiro Yamada 6c20faec 6613476e

+4 -4
+4 -4
scripts/Makefile.defconf
··· 9 9 # Input config fragments without '.config' suffix 10 10 define merge_into_defconfig 11 11 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ 12 - -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \ 13 - $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config) 12 + -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \ 13 + $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config) 14 14 +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig 15 15 endef 16 16 ··· 23 23 # Input config fragments without '.config' suffix 24 24 define merge_into_defconfig_override 25 25 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ 26 - -Q -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \ 27 - $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config) 26 + -Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \ 27 + $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config) 28 28 +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig 29 29 endef