From patchwork Fri Jan 20 13:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13109885 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58BEFC25B4E for ; Fri, 20 Jan 2023 13:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oDp+mAifh1a33yuLMYH819k6MYbV9RGpmgYnUjjr74s=; b=BEE5Z02ryBwj2Z LzISm6vWsta0ze+d15XTwsGdNxmlEMpNeqOZ8Le6CuCSZGd9YV7p9sk9FzFgWob+cX5l4VVhh1nLv Q1DQtAfLUJV0PUwHMTS1y0rSJr6W/RlaIRixBNBkwLU+oUrFKDk+WZEr0RQR3v0UF9fR9GtIOVh/I 0eFy/7wCSe94JkFwzKtL6oP5DjzKN+HHpjLoS8C14B9pyD7qK0WXXwVvX/M98zd7g8qxKqoYlweHZ zJPb3K7zjHF9VZP7vqVRpVH9orF5UCi7fqM7ARiJJ1NUEaBmiqYqdOBJL+haScLKIN8BMSroqGkCk sA7SWkAnYmUKCrn/A1fw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIrZw-00AT6Q-6Z; Fri, 20 Jan 2023 13:37:12 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIrY0-00ASEm-St for linux-arm-kernel@lists.infradead.org; Fri, 20 Jan 2023 13:35:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1674221712; x=1705757712; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jeLxjazrEih89VJNavAbz95sBkW/7H1uB/1gGqv3ROs=; b=QRwj+zY2BBXOTYJ717/onafB+uYing9XZwNf8uAw/LGY6/Nl1/zbcokb W5a5fwoInGy17o2LIBkoGIL94rGAwWLZdvkUCi4OVQKAuj0AHq/Yhj+VT EABplmelBtSQDm+vmJvhVSBDSMb6IQzZ/M/WM2VI5baeNzRL06FRG0HEd ARWMwF1mo8QOhEAhC63bFQTJCms9x9jPrzwPMbYFAIoazw9eR3yv1yT2g IjwpsBI1UE3qim6Xn1gzM0c0s6gCVZmA9KW3ML51+ywymR++Thc5s+11/ wW2OH+Y38DeJiulGqWr1NwasTAw7LqqGo7spblm7PdvI4/DaoIvgaPrV4 g==; X-IronPort-AV: E=Sophos;i="5.97,232,1669071600"; d="scan'208";a="28561591" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 20 Jan 2023 14:35:06 +0100 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Fri, 20 Jan 2023 14:35:06 +0100 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Fri, 20 Jan 2023 14:35:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1674221706; x=1705757706; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jeLxjazrEih89VJNavAbz95sBkW/7H1uB/1gGqv3ROs=; b=oJuRmyzBqL7aeSuf5iRIj9SBrXiLVpHa+9ELCuExiHd4+JRAnzLZ8+yD BDlJBssQiPDKIkLm3QxZF1ty5sAiVkE7K0zMrySdOfsBBc44VSCgkYukQ mE1PRH+HtmgpyLMKwAI5sxACLh2ZgY/KpB/S+wDxwtS6kIW4BNV3m8EHV 0n4xX8+8ff5aGduJoKoLtyGQ1uOadCwL+RUBW0gsPQiJY3ICw3sY5SPrf 3XibdPaZbaokhiZJS0OKX6atD4ZT82YyH0+DO7BR5IktZNlnAVT7jamh/ vlIJqvC6HFObkkcsmylo87C7b+nUNFC0EjPXtamkRlM/dlQA/XNZt4b1O A==; X-IronPort-AV: E=Sophos;i="5.97,232,1669071600"; d="scan'208";a="28561590" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 20 Jan 2023 14:35:06 +0100 Received: from steina-w.tq-net.de (unknown [10.123.53.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id DF6B9280074; Fri, 20 Jan 2023 14:35:05 +0100 (CET) From: Alexander Stein To: Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Olof Johansson , Shawn Guo , Li Yang , Russell King , Marek Vasut , Marcel Ziswiler , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Cc: Nicolas Saenz Julienne , soc@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kbuild@vger.kernel.org, Alexander Stein Subject: [PATCH v2 09/10] kbuild: Add config fragment merge functionality Date: Fri, 20 Jan 2023 14:34:54 +0100 Message-Id: <20230120133455.3962413-10-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120133455.3962413-1-alexander.stein@ew.tq-group.com> References: <20230120133455.3962413-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230120_053513_272997_3F9B7A3C X-CRM114-Status: GOOD ( 16.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne 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: Nicolas Saenz Julienne Signed-off-by: Alexander Stein Acked-by: Arnd Bergmann --- Directly applied from https://lore.kernel.org/linux-arm-kernel/20200203184820.4433-2-nsaenzjulienne@suse.de/T/#m96968dd45c0aaa88e0a7387024b5ac13b002363d arch/powerpc/Makefile | 12 +----------- scripts/Makefile.defconf | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 scripts/Makefile.defconf diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index dc4cbf0a5ca95..533457466ce25 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -253,17 +253,7 @@ PHONY += bootwrapper_install bootwrapper_install: $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@) -# Used to create 'merged defconfigs' -# 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 - +include $(srctree)/scripts/Makefile.defconf PHONY += pseries_le_defconfig pseries_le_defconfig: $(call merge_into_defconfig,pseries_defconfig,le) diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf new file mode 100644 index 0000000000000..ab332f7534f51 --- /dev/null +++ b/scripts/Makefile.defconf @@ -0,0 +1,15 @@ +# 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