From patchwork Tue Mar 8 08:34:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randrianaina Georges Aaron X-Patchwork-Id: 12773285 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9286EC433F5 for ; Tue, 8 Mar 2022 08:40:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345035AbiCHIlq (ORCPT ); Tue, 8 Mar 2022 03:41:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240639AbiCHIll (ORCPT ); Tue, 8 Mar 2022 03:41:41 -0500 Received: from mail3-relais-sop.national.inria.fr (mail3-relais-sop.national.inria.fr [192.134.164.104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 943E13FBDA; Tue, 8 Mar 2022 00:40:44 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.90,164,1643670000"; d="scan'208";a="7901334" Received: from randriaga.irisa.fr (HELO randriaga) ([131.254.10.20]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2022 09:40:42 +0100 User-agent: mu4e 1.6.10; emacs 27.2 From: Randrianaina Georges Aaron To: Masahiro Yamada Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Mathieu Acher Subject: [PATCH v2] kconfig: add KCONFIG_ALLCONFIG support for tinyconfig Date: Tue, 08 Mar 2022 09:34:16 +0100 Message-ID: <87v8wo25we.fsf@irisa.fr> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Since f8f0d06438e5, tinyconfig overrides KCONFIG_ALLCONFIG to include kernel/configs/tiny-base.config. However, this ignores user's preset if defined. This modification checks if the user has set KCONFIG_ALLCONFIG and if so, concatenates it with kernel/configs/tiny-base.config to be used as preset config symbols. Changes in v2: - Remove `<(echo)` in the cat command as it is not portable - Add $(srctree) in presets' path to make it compatible with O= Signed-off-by: Randrianaina Georges Aaron --- scripts/kconfig/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index b8ef0fb4bbef..58a677db9a73 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -102,7 +102,13 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c PHONY += tinyconfig tinyconfig: +ifeq ($(KCONFIG_ALLCONFIG),) $(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig +else + $(Q)cat $(srctree)/$(KCONFIG_ALLCONFIG) $(srctree)/kernel/configs/tiny-base.config > $(srctree)/.tmp.config + $(Q)KCONFIG_ALLCONFIG=$(srctree)/.tmp.config $(MAKE) -f $(srctree)/Makefile allnoconfig + $(Q)rm -f $(srctree)/.tmp.config +endif $(Q)$(MAKE) -f $(srctree)/Makefile tiny.config # CHECK: -o cache_dir= working?