[PATCH 2/3] kbuild: Provide a version of merge_into_defconfig without override warnings

From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
	 Will Deacon <will@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	 Nick Desaulniers <ndesaulniers@google.com>,
	 Nicolas Schier <nicolas@fjasle.eu>,
	soc@kernel.org,  Masahiro Yamada <masahiroy@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
	 Peter Zijlstra <peterz@infradead.org>,
	linux-arm-kernel@lists.infradead.org,
	 linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Mark Brown <broonie@kernel.org>
Subject: [PATCH 2/3] kbuild: Provide a version of merge_into_defconfig without override warnings
Date: Fri, 10 Feb 2023 19:52:48 +0000	[thread overview]
Message-ID: <20230203-arm64-defconfigs-v1-2-cd0694a05f13@kernel.org> (raw)
In-Reply-To: <20230203-arm64-defconfigs-v1-0-cd0694a05f13@kernel.org>

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 <broonie@kernel.org>
---
 scripts/Makefile.defconf | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

-- 
2.30.2

