From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EE3AC433DB for ; Sun, 21 Feb 2021 13:05:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 49BE064F07 for ; Sun, 21 Feb 2021 13:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbhBUNFB (ORCPT ); Sun, 21 Feb 2021 08:05:01 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:58309 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbhBUNEh (ORCPT ); Sun, 21 Feb 2021 08:04:37 -0500 Received: from grover.flets-west.jp (softbank126026090165.bbtec.net [126.26.90.165]) (authenticated) by conuserg-10.nifty.com with ESMTP id 11LD3L9k011207; Sun, 21 Feb 2021 22:03:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 11LD3L9k011207 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1613912602; bh=qS/D3Dr04t+wT3tHPP3OA2ceB85dJFZJPAutCG6/3mQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Gt+YMo0QeLDbEDDYlA15fg11g3T6y5WiVcIyervV5XyB75baDBgqt5NC0opq/5S2 X4eZ/MVMQEmdKFI4AOF9uu9oeokGXTrSZaPhtxJ+yD215mxSPAm1oTDtsMfJ39x78c bGhfmUXw7X96T0QTWmcpYlP1MkIkdXY1k0V0U/ZPNCklEVYYiz2nRfFz3vvGvPp0YZ 7VsoxhdBblTM+tHM/n0oicCZR2lLK3AbLVNokqLYinVwoDjcsRFlCpYWAvBqAokiYK kMvZOVll9qy/MunVXABoDntX2fpCj1oEup32+DSVBMM0FdJ5PMt9Lpo31IhT5BHqiL u4+LFoLuatqUA== X-Nifty-SrcIP: [126.26.90.165] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] kconfig: omit --oldaskconfig option for 'make config' Date: Sun, 21 Feb 2021 22:03:17 +0900 Message-Id: <20210221130318.160327-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210221130318.160327-1-masahiroy@kernel.org> References: <20210221130318.160327-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org scripts/kconfig/conf.c line 39 defines the default of input_mode as oldaskconfig. Hence, 'make config' works in the same way even without the --oldaskconfig option given. Note this in the help message. This will be helpful to unify build rules in Makefile in the next commit. Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 2 +- scripts/kconfig/conf.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 2c40e68853dd..5180a71c931f 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -29,7 +29,7 @@ menuconfig: $(obj)/mconf $(Q)$< $(silent) $(Kconfig) config: $(obj)/conf - $(Q)$< $(silent) --oldaskconfig $(Kconfig) + $(Q)$< $(silent) $(Kconfig) nconfig: $(obj)/nconf $(Q)$< $(silent) $(Kconfig) diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 37e17934b67a..957d2a0832f7 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -483,6 +483,7 @@ static void conf_usage(const char *progname) printf(" --randconfig New config with random answer to all options\n"); printf(" --yes2modconfig Change answers from yes to mod if possible\n"); printf(" --mod2yesconfig Change answers from mod to yes if possible\n"); + printf(" (If none of the above is given, --oldaskconfig is the default)\n"); } int main(int ac, char **av) -- 2.27.0