Commit a400c287 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Arnd Bergmann

kbuild: Add config fragment merge functionality

So far this function was only used locally in powerpc, some other
architectures might benefit from it. Move it into
scripts/Makefile.defconf.
Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230124110213.3221264-10-alexander.stein@ew.tq-group.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent af8bd008
...@@ -253,17 +253,7 @@ PHONY += bootwrapper_install ...@@ -253,17 +253,7 @@ PHONY += bootwrapper_install
bootwrapper_install: bootwrapper_install:
$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@) $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
# Used to create 'merged defconfigs' include $(srctree)/scripts/Makefile.defconf
# To use it $(call) it with the first argument as the base defconfig
# and the second argument as a space separated list of .config files to merge,
# without the .config suffix.
define merge_into_defconfig
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
-m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
$(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef
PHONY += pseries_le_defconfig PHONY += pseries_le_defconfig
pseries_le_defconfig: pseries_le_defconfig:
$(call merge_into_defconfig,pseries_defconfig,le) $(call merge_into_defconfig,pseries_defconfig,le)
......
# SPDX-License-Identifier: GPL-2.0
# Configuration heplers
# Creates 'merged defconfigs'
# ---------------------------------------------------------------------------
# Usage:
# $(call merge_into_defconfig,base_config,config_fragment1 config_fragment2 ...)
#
# Input config fragments without '.config' suffix
define merge_into_defconfig
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
-m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
$(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment