diff options
| author | Mark Brown <[email protected]> | 2023-02-10 19:52:48 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2023-02-13 20:18:28 +0100 |
| commit | a63971257e66bbf354e8801623caffa965e9ba5c (patch) | |
| tree | 74f1423b460b540cacf89f9f897a870728ed6524 | |
| parent | 46dff8d7e381e74a501cbec6285a21dba1d9fccf (diff) | |
kbuild: Provide a version of merge_into_defconfig without override warnings
While warning on overridden Kconfig options is a good default for merging
config fragements sometimes that is our explicit intent and the warnings
are unhelpful, add a new merge_into_defconfig_override which does the merge
but with warnings suppressed.
Since merge_into_defconfig accepts any number of fragments it is difficult
to allow it to accept the flag.
Signed-off-by: Mark Brown <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
| -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 |