diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.defconf | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf index ab332f7534f5..ab271b2051a2 100644 --- a/scripts/Makefile.defconf +++ b/scripts/Makefile.defconf @@ -13,3 +13,17 @@ define merge_into_defconfig $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config) +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig endef + + +# Creates 'merged defconfigs without warning about overrides' +# --------------------------------------------------------------------------- +# Usage: +# $(call merge_into_defconfig_override,base_config,config_fragment1 config_fragment2 ...) +# +# Input config fragments without '.config' suffix +define merge_into_defconfig_override + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ + -Q -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \ + $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config) + +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig +endef |