From patchwork Wed Jan 10 06:56:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124026 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4925026qgn; Tue, 9 Jan 2018 22:58:49 -0800 (PST) X-Google-Smtp-Source: ACJfBot+SLXJTgISuxXb/sa41sjbnPpcgiWwL+J4+AQ/P6JFrnkvz/aZQWchHhAlbZuCgR+6DARY X-Received: by 10.98.135.76 with SMTP id i73mr8364284pfe.183.1515567529464; Tue, 09 Jan 2018 22:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515567529; cv=none; d=google.com; s=arc-20160816; b=t1dNjWEZZbyuA/XTsOZ30VVqXz7KktEfA8w+cWChaVUabD1DITpGH4NXJcEH/FVx6U 6HqQisGwpOQ6aIxdAWo/PpB1DeryPVQ4t+I8mjBi1R5/v207GjP/rt8B71+H/ZUCr8+2 dRhoJNEcZhviV2MAJ/UyBBIJ4yN31EvdH4NZyrsxhntR/Psoe8lOX69Gdm9r2lKGgMXp aOyy93ntNqwrZZtYNWWJbe840RJTQxHNBBRiJ9uGo891yZmUY2pLL0S6yppG8OtC8Vc2 HO2JBMgqkEtbTm9K3jdgV9b8NhmMWq0SG6TN52KwxkLgRSQE4/u0wYUDQ1FtoBlMVucH aelg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=PQeMC+9dmrlwnUxCepFOOnNlaQtsR9RxDtrErMK0Cdg=; b=g3gzFpgPViDBe7WeQKbOwtLs9sr6lTVNnMPcwYl9/+r7VPxnh4gdCWBKbw5h24j6um Rwnnh40l2eaKfggV1srizy5mtqhmXzCY9fxv2pGxlokxYgMC/7IJ5p7qOCoWdqLTLPE5 KqCFPtr9Ewt6/OfnA9iqBC1ZijaIpVu89kHQ9RjyzoGWQuQEJSwnQUagej7KhgzLyg6w BgYeICdW777POuE+s+LEf251/qW2wRzoXdRNc3Q+qzDbz3eDwC6P0RSU0lFiC/rFralE 4eqqJbU1qIWlVECd89OqawwEV4UheCNDe7Hm0ZpYIKW5hYqy/exE4Y/6dkp7MWg2vnY5 u4+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=aVMa9neW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si6279203pfi.402.2018.01.09.22.58.49; Tue, 09 Jan 2018 22:58:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=aVMa9neW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753825AbeAJG5e (ORCPT + 28 others); Wed, 10 Jan 2018 01:57:34 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:22641 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753544AbeAJG51 (ORCPT ); Wed, 10 Jan 2018 01:57:27 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0A6uM2j020629; Wed, 10 Jan 2018 15:56:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0A6uM2j020629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515567383; bh=PQeMC+9dmrlwnUxCepFOOnNlaQtsR9RxDtrErMK0Cdg=; h=From:To:Cc:Subject:Date:From; b=aVMa9neWF4cjWcad04M6ls6xLl0uG7gnnSnOPLuxWV8k5BfKlmjvjWaUBh1u7unZ2 e6uQl9pIwZsIti8ynMGnT429gRBvX0l9II+dwFDHJTFa2u0ziQYEEaKGo4nCreeiKR fOODaparxZdBLKAkIMV/Y7yZ8WcpAUV+rABGo8gUEP3O4AN26TSM5zNSGAF95O3EZn 6qLVRCXOFfLkU8jF4M4IUMSu9aVlIduVnmDGkdohZt4QBSSrnc4y3n9pAAOiIOglPd 6TnqaC1tGoduy4mcNW3LRrfOI7z4QfOOf1J+HEyPMjBpOCvvnTdJNDhvbladMH5q6r eqUNAbWKct1Jg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Marc Herbert , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/6] kconfig: do not call check_conf() for olddefconfig Date: Wed, 10 Jan 2018 15:56:09 +0900 Message-Id: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org check_conf() traverses the menu tree, but it is completely no-op for olddefconfig because the following if-else block does nothing. if (input_mode == listnewconfig) { ... } else if (input_mode != olddefconfig) { ... } As the help message says, olddefconfig automatically sets new symbols to their default value. There is no room for manual intervention. So, calling check_conf() for olddefconfig is odd in the first place. Rather, olddefconfig belongs to the group of alldefconfig and defconfig. Signed-off-by: Masahiro Yamada --- scripts/kconfig/conf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.7.4 Acked-by: Ulf Magnusson diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 866369f..52cbe5d 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -434,7 +434,7 @@ static void check_conf(struct menu *menu) if (sym->name && !sym_is_choice_value(sym)) { printf("%s%s\n", CONFIG_, sym->name); } - } else if (input_mode != olddefconfig) { + } else { if (!conf_cnt++) printf(_("*\n* Restart config...\n*\n")); rootEntry = menu_get_parent_menu(menu); @@ -674,15 +674,15 @@ int main(int ac, char **av) /* fall through */ case oldconfig: case listnewconfig: - case olddefconfig: case silentoldconfig: /* Update until a loop caused no more changes */ do { conf_cnt = 0; check_conf(&rootmenu); - } while (conf_cnt && - (input_mode != listnewconfig && - input_mode != olddefconfig)); + } while (conf_cnt && input_mode != listnewconfig); + break; + case olddefconfig: + default: break; } From patchwork Wed Jan 10 06:56:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124025 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4924895qgn; Tue, 9 Jan 2018 22:58:37 -0800 (PST) X-Google-Smtp-Source: ACJfBotn+dSt3nz0pvwvWpAJg6/0N/3t+IiJWB04cecTqt/vfq9NOcif688nMlaCPZSUEgAOKeHk X-Received: by 10.84.237.9 with SMTP id s9mr1394619plk.176.1515567517166; Tue, 09 Jan 2018 22:58:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515567517; cv=none; d=google.com; s=arc-20160816; b=kxEDeDYTg7qy63Rpk0w5KCMRxsqJ0phtK1gjy8M6BBezXuiGMTU2DVr3t4jmVm2RVg f8NrA3pi8Dty1h0pGbKtkLirKoLHORcBjCz4jbHUo5WK32licB5vsZg6FKC3Jk+BSmia J7iXUyH42YpYMQLcPOcUStLe/pcfOdjDOdVsiovbG9SBoRVId4HmqSzh3aJWcmMp9AQ9 hQh77i3cIYbATEmGEnz9N4M/hvjXzaE76hx4boXE3G6ht1uq2LMeyQ5CInea9ETZyS21 mKCJk+6c7MCYLSwyviOsGrW1777FBMC0ygSzNL+FYO/C1s1xQJK5/0uFtgWgcTdN2hcj KXUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=sap77Cap95H/8MfygOZ/EKEAvi7suaYTf3LnGeHUnnM=; b=q2XgwkRFfXbrcJBYKQ5F560Qbj79X8fM/WIdqXTdmrFZrK+O4zni8kz2DNJVTvk5mb CuJ7GEZHwvCJ3pZxaIhtqHcxigMEXj9BFoM/SQqbQNx9aOD3VZFNkPb8YdJFrrK5TPoV 3gJlyafnPAECNJlG5v3w1VNFETOV2SR3G4yGix+iT/Zx5opnr1imL1qmefqhsBfcusYA BJtPykXIz6caBTNTTIg7betmrQSVPNG+fSsv5rJ8d1lznSLQANAPdQgRQ3VrPAIex8Tz +C0NvPnhGtt/0a1Fdnq5KDEBoUdpvjykNERu5mjiuROsXOCg5VnJIejUZNBmZTCWOyy5 17yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=StTq+MQe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si6279203pfi.402.2018.01.09.22.58.36; Tue, 09 Jan 2018 22:58:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=StTq+MQe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753882AbeAJG5g (ORCPT + 28 others); Wed, 10 Jan 2018 01:57:36 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:22638 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753547AbeAJG51 (ORCPT ); Wed, 10 Jan 2018 01:57:27 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0A6uM2k020629; Wed, 10 Jan 2018 15:56:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0A6uM2k020629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515567384; bh=sap77Cap95H/8MfygOZ/EKEAvi7suaYTf3LnGeHUnnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=StTq+MQerDe/gSD6awZn4kIA1IwsunlcwmOMfmFB6bTowNQh1gxThrlFRJ9AhFJWC ZJYrwfGdNrxQt2Oi40VB/fsiq6mWGfCOSV2V6VsIfFpRg+KsthvUJjP0cRVS4lG+yr Q7BsV9k7hmTPaitNbgxV/riCi65QyiDmNuApVaPHFINc1oB3RlZxs9n1NER/uXyoFN 9mYkvk7e+MZTbWMhuBfo8obDywTaB0GFk5hPSR1pCJXFdbLUIDv5iaiKY4WAUZAuVX XMhTIkMDhkwaPQKK2DBWZbRjxHEgYYN6xCnYxdnW9UfTKyktzz6xml9rzNcyNeBXnA pj8BAXYGKJYiw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Marc Herbert , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/6] kconfig: call sym_calc_value() for all symbols before writing to .config Date: Wed, 10 Jan 2018 15:56:10 +0900 Message-Id: <1515567374-12722-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> References: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org conf_write() skips sym_calc_value() for "choice", but we do not need to do so. conf_set_all_new_symbols() may have already called sym_calc_value() for "choice", but set_all_choice_value() has cleared SYMBOL_VALID away. So, conf_write() re-calculates "choice" here when calculating the visibility of its children (choice value). We can pass NULL to sym_calc_value() since it is no-op. This should give no impact on behavior, but make the logic more easier to understand. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 Acked-by: Ulf Magnusson diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 027f5b4..bc83965 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -790,6 +790,8 @@ int conf_write(const char *name) menu = rootmenu.list; while (menu) { sym = menu->sym; + sym_calc_value(sym); + if (!sym) { if (!menu_is_visible(menu)) goto next; @@ -799,7 +801,6 @@ int conf_write(const char *name) "# %s\n" "#\n", str); } else if (!(sym->flags & SYMBOL_CHOICE)) { - sym_calc_value(sym); if (!(sym->flags & SYMBOL_WRITE)) goto next; sym->flags &= ~SYMBOL_WRITE; From patchwork Wed Jan 10 06:56:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124023 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4924141qgn; Tue, 9 Jan 2018 22:57:36 -0800 (PST) X-Google-Smtp-Source: ACJfBotIcTlMVdD3cCGaM2v4uvQ9QyfIGwlwhuPOPnImPTAYxLKPMstPX02kpZZRHkkN6dJAukZp X-Received: by 10.84.128.71 with SMTP id 65mr18320442pla.282.1515567456113; Tue, 09 Jan 2018 22:57:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515567456; cv=none; d=google.com; s=arc-20160816; b=DJBlZV/MZuwRj/YwZE9lOYooqCOyx34MiFyf0uqEA4mFSvWZqsPC6wddFZV1QqLv3E ot8u2EEqbKAE8sVSyVg64SJsFo/Sfe+nX63V0b6C//P7/xEVcfi5zVBignodm1/87ffa 5l52RwT/Uvjzy7B7bOD9IkghQR1gcMkn3HpxvgTv4yum36hpXG56BeWIM3kfjyHtz0ry HptF1MWpRu8tNhcJJ6p9agZFRfzZRHXNdsaXF3xKOJP58womotT6Y+58baNy4vtzMNBY uJbW7q67fH49AO98oJRwf9MwK/HTvMNveW7Qs9ZaJhp4X4J+xzUIeXGMbwKB5RVt4aJl Ji3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=kov1RaOhmFeH+x92TYAwGwar3USzVtkZfrmfR/isIks=; b=Jg/TO/RY/iicuvAmipJxsGerxf6ATfLIHdQhYdoiP8bTp8IP16om+FtEexgVuaCTXn n9Y4AJE4Qf+iExSa3PBicd2fhHVM0SRiUVifBdOdP0pBSuo+SHjuPHCwMqNW9fAyEnfa X2bWV1LnggHTdFSOFuZsxjrZIYhQXGR3IZdxcww9wkQq246PtwU1qfC+lFlPYWgv3lWz A0+V88W0L0EGdRJxTaUrhxi6xYLS8ZJXi/RGtZgVkBBLBARgwrWQ7J/cSv7fb2yutmFH Iw/ULnX99cT3wUbL61zEl7ArSRibg01QLDg5gPA48BF5Zv/4CXy2Zc+bmGcUdnug8iq/ 5i/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=LWWTKf+B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j19si11487062pll.586.2018.01.09.22.57.35; Tue, 09 Jan 2018 22:57:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=LWWTKf+B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753730AbeAJG5d (ORCPT + 28 others); Wed, 10 Jan 2018 01:57:33 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:22640 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752280AbeAJG51 (ORCPT ); Wed, 10 Jan 2018 01:57:27 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0A6uM2l020629; Wed, 10 Jan 2018 15:56:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0A6uM2l020629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515567385; bh=kov1RaOhmFeH+x92TYAwGwar3USzVtkZfrmfR/isIks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LWWTKf+BvbZdffVqTFzgIrIcDXLA01lFFL33CPpK9C+mUCHJU5RFuuXb0gK3XnY+G FXZ8ng1FDlVhX+FTt6CirB1/tp3rW6Eu8H18xs6NAOvW2LexpYqd6tvitb6PpeYw3p ikhEjhMMsg7xh/2Juv0fGXaW7rDujpOxTZFPdayF3PwATJ7+pyy88x0fnh3xPNP20W Y5Udm0tiSTTJx3JM9JxqCr+l3TStgbxieuFtOBnqJyaBa59W0q+N1zaNuY1Td1jBYQ rzckndN9/hUAXbYFJaMzc2BtK6XfkyZQMEyS9kCVlTSfEB7aecwTPpN86iHs+TvKJd tQoUPFPtC2+vg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Marc Herbert , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] kconfig: do not call conf_set_all_new_symbols() for (all)defconfig Date: Wed, 10 Jan 2018 15:56:11 +0900 Message-Id: <1515567374-12722-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> References: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (all)defconfig does not need to call conf_set_all_new_symbols() because conf_write() calculates all symbols based on their default unless they have been user-defined. conf_set_all_new_symbols(def_default) is no-op except for "choice". It calls sym_cal_value() for "choice", but the SYMBOL_VALID is cleared by set_all_choice_values() later on. So, conf_write() will re-calculate it, which is just a wasteful computation. The only difference I see is SYMBOL_DEF_USER flag for "choice", but it gives no difference to the resulted .config file. I confirmed this change still produced the same .config for all ARCH. I also moved savedefconfig to collect the no-op cases at the end of the switch statement. Signed-off-by: Masahiro Yamada --- scripts/kconfig/conf.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 52cbe5d..8364811 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -655,18 +655,10 @@ int main(int ac, char **av) case allmodconfig: conf_set_all_new_symbols(def_mod); break; - case alldefconfig: - conf_set_all_new_symbols(def_default); - break; case randconfig: /* Really nothing to do in this loop */ while (conf_set_all_new_symbols(def_random)) ; break; - case defconfig: - conf_set_all_new_symbols(def_default); - break; - case savedefconfig: - break; case oldaskconfig: rootEntry = &rootmenu; conf(&rootmenu); @@ -681,7 +673,10 @@ int main(int ac, char **av) check_conf(&rootmenu); } while (conf_cnt && input_mode != listnewconfig); break; + case alldefconfig: + case defconfig: case olddefconfig: + case savedefconfig: default: break; } From patchwork Wed Jan 10 06:56:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124024 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4924287qgn; Tue, 9 Jan 2018 22:57:47 -0800 (PST) X-Google-Smtp-Source: ACJfBov349wg9X1XQz/0O98YOGq0wabJC2LHW9JHcc+8CE48MGTnWY7lIU0JzuaWZFkS0SfkQa0t X-Received: by 10.99.142.76 with SMTP id k73mr8103093pge.89.1515567467389; Tue, 09 Jan 2018 22:57:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515567467; cv=none; d=google.com; s=arc-20160816; b=VJFfWj+iFd2gAtFqDnB761XO1PlnUz3cnb7j0jFz3qfFg3qXt0XgrI4CWij3oHnmty p75SDkm+FDdqoWKD/YsckKYd/wpwcDgnf5+ueBqjKrm+3W5Gx9JKMfxmSXqMy9FaB0VS bpBkMm0nMVgDjOASxTIevTwyWsI7E2hFhg4tJ7yChNFGZsIXrMmcRzNtnMQHpoxSZ//c iCtAC9ye4XThZZkC4Rp0NprnTwll6jktiBZ/2XDws1LVVoQh72r1TlcYL2/oBV/aKBuY CKwnyGxik3Xxu+IPBbd3rd9YMUfnwN3xwdxpb6qeAasMD323gU1XeRxtUU23nVZmsFwl r6WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=S4wuIZ0nKzqSZHzp/Dn6OKE3P4LhAuvWTHU0sV8oD+c=; b=X3ZbauI0N3MUjgZDhwPzn1iYQytDusYpZWNnDL1JXdtY8yuYWtTmDKv0QNT8J7GiBa QfgXeMhmQfxa2/z3cWT18l1jMeXBVfj0aNXwk0IK0gOq3fu4Jx0YY9wNZzztAuu0H5QA x9LBdZskXIDwZbqtyAIzuI0Eg4OI7OEIx7XzbCNFmK8xl5/7CXKnvrxYqclD/P+F1W6O g9eC8eF17vXzCJ1ssC8Re0oO8JC02fBDCGnylxNhWswOX39PAj7RYYoV+VPGwMUP1Q2e f7xWiSU5Nyo7wH47r/IjBvgo1MWsbKk+bjOp1M1LdKYiQwSq/HRNgtSN9nDo/SHOO6JF BHHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=0xcREh44; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v11si3230390pgb.825.2018.01.09.22.57.47; Tue, 09 Jan 2018 22:57:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=0xcREh44; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753978AbeAJG5h (ORCPT + 28 others); Wed, 10 Jan 2018 01:57:37 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:22693 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753542AbeAJG52 (ORCPT ); Wed, 10 Jan 2018 01:57:28 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0A6uM2m020629; Wed, 10 Jan 2018 15:56:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0A6uM2m020629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515567385; bh=S4wuIZ0nKzqSZHzp/Dn6OKE3P4LhAuvWTHU0sV8oD+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0xcREh44yoCOM40yrQ0gemjkZmSOtVRlbzUuvkaRv3GeEQZdmSCakaJel1oZoAhGB +slzPUM3V9YQDQJG5BddPMmkz58Bad14G9Ez806eAxMiy7KHMBAX5yUguJ6Axla0Xx gocCkB15HJO0GvYlFN0Ihh09qfkjeNoZNLXE7qxuDK040OpR3Imo1cEnpDiCpwu/n1 uc88RI6fyPRHy/coRNebNhxtmiJDNJH8vCYU1OvIk4yLaH2gQFGXl/JI8loFlQiT6Y F9wyRZ2INzhY5196iW/uWqCpZpUHpgei/+JxKhLnpd8VMUUui5FB12Y2XBorv04Ywx coD2JSShrgTkQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Marc Herbert , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 4/6] kconfig: remove unneeded input_mode test in conf() Date: Wed, 10 Jan 2018 15:56:12 +0900 Message-Id: <1515567374-12722-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> References: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org conf() is never called for listnewconfig / olddefconfig. Signed-off-by: Masahiro Yamada --- scripts/kconfig/conf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.7.4 Acked-by: Ulf Magnusson diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 8364811..693cd5f 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -368,9 +368,7 @@ static void conf(struct menu *menu) switch (prop->type) { case P_MENU: - if ((input_mode == silentoldconfig || - input_mode == listnewconfig || - input_mode == olddefconfig) && + if (input_mode == silentoldconfig && rootEntry != menu) { check_conf(menu); return; From patchwork Wed Jan 10 06:56:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124028 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4925844qgn; Tue, 9 Jan 2018 23:00:00 -0800 (PST) X-Google-Smtp-Source: ACJfBovSJzQllPLYyrP0AbL4ykCro+Jl28OqNyLC9XGo9m+DrG2WvqmJiDW4YtXu3N9jU+DvNVcc X-Received: by 10.99.107.195 with SMTP id g186mr13421222pgc.97.1515567600591; Tue, 09 Jan 2018 23:00:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515567600; cv=none; d=google.com; s=arc-20160816; b=TsJ8n/QxrntSv548+BKBpWPWoJk0lxlid/x0v883ect6eRmRGv/D0FbrXT8TtbG+Ew VlcBgj0Xs4E4GtwWoGwn+jien4jWJuZ+RljuWR3162MNaAA1vsQUCi5PE8qVA36R9Ac8 avBioxFLGQAcfoWpM+5B79kIjq+BXyXRTPBYQyhGyk0EZM6297yHLnw02fNeau9O47+g 0VLsqFDjzGEOXiXTcPA86Njh1qJOIMOD8bWvvCGV14qgRsqhFD7Xsfwr6e71SOvGIToT oBQmAKDH5QxtG+VKhk/4Wh54H5Bso1mXsQ5wVJ9MUz2Ojw8aWU26N7TNE73eXY7rGgop WrTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=9/ImEW7KAYC5SxhQV7mjem7PAGowCp06YeFrs3dqlJ4=; b=JmaSFJmUUohZ7uQL9ji65fUdR4OtDUaxXYLqTv97RoEFLQQyPIg0SL/ZVSE3jZxnmZ GIdQ4umxdITVM7SJ6/P1Xq/cWWiswfu/5aYqb9AStz864yc2OYQhGJWXuEPnzX1VMrls 91VRllD458sLBx2WGOCEI6ROc/9kwbOV8d4SWwgzHstY76lQEfcNn+iQB42TxM/4hh71 RfgUVuX/aJfwBAk7yrANiqic+Kjv52aVxv1YIYgklrVT0NUaEHowVZalT6IyfnoM1n+t tQKXUwmG+SlNBhlfQYylr3+eeemCLj6uNiiRpSEYJMdOHp7XcDLrLVIwK2bKOn95QaTR BXug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=O1qmsdtm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w63si11286413pfd.289.2018.01.09.23.00.00; Tue, 09 Jan 2018 23:00:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=O1qmsdtm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753666AbeAJG5a (ORCPT + 28 others); Wed, 10 Jan 2018 01:57:30 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:22637 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753545AbeAJG51 (ORCPT ); Wed, 10 Jan 2018 01:57:27 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0A6uM2n020629; Wed, 10 Jan 2018 15:56:26 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0A6uM2n020629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515567386; bh=9/ImEW7KAYC5SxhQV7mjem7PAGowCp06YeFrs3dqlJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O1qmsdtm8x2myqYz9+pFCBw6bOJok9LdmlridJTuIqj+BMxW/G19KDSIpxgweHjh2 BXwxFCBa/GgLRSExDevtp2ibMRjVEjqtRhYQf9aJGuBn4nUJ3rEE6BwqtBnLDvnxKN 2jvIm8odhkP3WmaVzzivPrS/JycQuwjek37anKpfbkWtWXm5vzsIyHP/5JrPHJSXup skqhj5doui+CZzpaYAH7uEzo7OC7J5sNBgntOzfgqYVqVJPgCggk2prqlSdb8UqP96 03PmjQiHTT4k3Cp8Jx0yGdjvqSfgc/27MvNsn/ju3GaCNPH5KmJAeCDGWsvJanper/ 9ffnnNLjDxYww== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Marc Herbert , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 5/6] kconfig: remove redundant input_mode test for check_conf() loop Date: Wed, 10 Jan 2018 15:56:13 +0900 Message-Id: <1515567374-12722-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> References: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org check_conf() never increments conf_cnt for listnewconfig, so conf_cnt is always zero. In other words, conf_cnt is not zero, "input_mode != listnewconfig" is met. Signed-off-by: Masahiro Yamada --- scripts/kconfig/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 Acked-by: Ulf Magnusson diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 693cd5f..1d2ed3e 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -669,7 +669,7 @@ int main(int ac, char **av) do { conf_cnt = 0; check_conf(&rootmenu); - } while (conf_cnt && input_mode != listnewconfig); + } while (conf_cnt); break; case alldefconfig: case defconfig: From patchwork Wed Jan 10 06:56:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124027 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4925452qgn; Tue, 9 Jan 2018 22:59:25 -0800 (PST) X-Google-Smtp-Source: ACJfBou2S1OKXIdWHEfg73WnvhczeIpa49r5qLCUSiibvZvtUgkRJZvs1JzLxfWJXZBsug80BJby X-Received: by 10.84.131.65 with SMTP id 59mr18362573pld.276.1515567565803; Tue, 09 Jan 2018 22:59:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515567565; cv=none; d=google.com; s=arc-20160816; b=zGMWy9JDbaPPs5AJpZZSR4swNDBYmzJEpza42cw5NvRSSYfTn/3RatXI/zChjlr3fE LfqzuA5eq4HMytejT0Zn6Vup9x90hVIdekdRKwJiYshAuc2bs0sfHGSnjMd2I8HKFpcd 8beiEny43n6UUUIeXFzKXyIBWdHAAIDMZLHlX5MhudWMU+UeYGM7LKhiPKk/rSHxeihE qgiybldJA0hxeq8wsBjYFYW5xQtooPyax6YJw5IB63L1XX7Dt6uNcb4OiFJqGOd2OAo0 ACs6KPoy78nq0ohf5KsheyCXmhExH4fu6rIKXnvII1DeKraaL+sPbzaqNFVcB6JTM36R i8Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=skXBkihUQNRyLVqEzoujP647sJJ2vyfDY0+hQCN76b4=; b=mrYmH4ENkaxiuGR+NjG6SawayRC+3JEgChsE6hngN+iCorcgOJZC4XH6WsLKlmo24t VhvxtQ+JSlDAff1t0hs3yVUxVkvN0BWTeQh9ZisNdCBC9XpOsS2Tz8iVp/ORlDzWCFhN Wdhk5V4iaSuEr95PzmT5ooB070DMP9k+6WVaBPSPag2MpEQ2EWhdEbUMjoou/jW3+3rU TLtmyPFjcihbNoXwQ+4mSWbAKYW3ZOiLRgDD1j4L8VedCdtVkJ6oIDHFyTxqW3zaV3Ex e8wKiALs1Xgcpjl+weUqtbKxvakKoUIk27Tla9xloPAofdskLur9rSkONcMZ5uTQ6ahh LONA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cpRNHbBO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t134si10175987pgc.168.2018.01.09.22.59.25; Tue, 09 Jan 2018 22:59:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cpRNHbBO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753691AbeAJG5b (ORCPT + 28 others); Wed, 10 Jan 2018 01:57:31 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:22642 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753532AbeAJG51 (ORCPT ); Wed, 10 Jan 2018 01:57:27 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0A6uM2o020629; Wed, 10 Jan 2018 15:56:26 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0A6uM2o020629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515567387; bh=skXBkihUQNRyLVqEzoujP647sJJ2vyfDY0+hQCN76b4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpRNHbBO8CP2BxdTJIRNId7gg3Yu9I1i7jd7bb1vTPqjyfuB3nw7tvMtcbu/Q0QPk eF+NGcd8ERKoaoHXVT02dcxH2h4OzZ1Gus/6z+ytYI85JcMa5yvxJyRyhGIFCTBPLH OH8qD1fnV52/vcxhheOGkmoUGXObFpBTNSuAS8w55WBfDYXC2EfG8Onau1uADpRYlg d+CADwAZPZKIiI9SbssHo6t8eNhBQ97Ks+YDIv+VDBqx/UXTOlGYhEgLI6YfjmV4ju SAh7VVinLv4RtgIvkCy8VjNP7b1AULn2XxbljvPiolhv0RT/pYgYoqzRJnySLBHCft RR3opCaMIKgjw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Marc Herbert , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 6/6] kconfig: hide irrelevant menu for oldconfig Date: Wed, 10 Jan 2018 15:56:14 +0900 Message-Id: <1515567374-12722-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> References: <1515567374-12722-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Historically, "make oldconfig" has changed its behavior several times, quieter or louder. (I attached the history below.) Currently, it is not as quiet as it should be. This commit addresses it. Test Case --------- ---------------------------(Kconfig)---------------------------- menu "menu" config FOO bool "foo" menu "sub menu" config BAR bool "bar" endmenu endmenu menu "sibling menu" config BAZ bool "baz" endmenu ---------------------------------------------------------------- ---------------------------(.config)---------------------------- CONFIG_BAR=y CONFIG_BAZ=y ---------------------------------------------------------------- With the Kconfig and .config above, "make silentoldconfig" and "make oldconfig" work differently as follows: $ make silentoldconfig scripts/kconfig/conf --silentoldconfig Kconfig * * Restart config... * * * menu * foo (FOO) [N/y] (NEW) y # # configuration written to .config # $ make oldconfig scripts/kconfig/conf --oldconfig Kconfig * * Restart config... * * * menu * foo (FOO) [N/y] (NEW) y * * sub menu * bar (BAR) [Y/n] y # # configuration written to .config # Both hide "sibling node" since it is irrelevant. The difference is that silentoldconfig hides "sub menu" whereas oldconfig does not. The behavior of silentoldconfig is preferred since the "sub menu" does not contain any new symbol. The root cause is in conf(). There are three input modes that can call conf(); oldaskconfig, oldconfig, and silentoldconfig. Everytime conf() encounters a menu entry, it calls check_conf() to check if it contains new symbols. If no new symbol is found, the menu is just skipped. Currently, this happens only when input_mode == silentoldconfig. The oldaskconfig enters into the check_conf() loop as silentoldconfig, so oldaskconfig works likewise for the second loop or later, but it never happens for oldconfig. So, irrelevant sub-menus are shown for oldconfig. Change the test condition to "input_mode != oldaskconfig". This is false only for the first loop of oldaskconfig; it must ask the user all symbols, so no need to call check_conf(). History of oldconfig -------------------- [0] Originally, "make oldconfig" was as loud as "make config" (It showed the entire .config file) [1] Commit cd9140e1e73a ("kconfig: make oldconfig is now less chatty") made oldconfig quieter, but it was still less quieter than silentoldconfig. (oldconfig did not hide sub-menus) [2] Commit 204c96f60904 ("kconfig: fix silentoldconfig") changed the input_mode of oldconfig to "ask_silent" from "ask_new". So, oldconfig really became as quiet as silentoldconfig. (oldconfig hided irrelevant sub-menus) [3] Commit 4062f1a4c030 ("kconfig: use long options in conf") made oldconfig as loud as [0] due to misconversion. [4] Commit 14828349719a ("kconfig: fix make oldconfig") addressed the misconversion of [3], but it made oldconfig quieter only to the same level as [1], not [2]. This commit is restoring the behavior of [2]. Signed-off-by: Masahiro Yamada --- scripts/kconfig/conf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.7.4 Acked-by: Ulf Magnusson diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 1d2ed3e..8b9cdf4 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -368,8 +368,7 @@ static void conf(struct menu *menu) switch (prop->type) { case P_MENU: - if (input_mode == silentoldconfig && - rootEntry != menu) { + if (input_mode != oldaskconfig && rootEntry != menu) { check_conf(menu); return; } @@ -660,7 +659,7 @@ int main(int ac, char **av) case oldaskconfig: rootEntry = &rootmenu; conf(&rootmenu); - input_mode = silentoldconfig; + input_mode = oldconfig; /* fall through */ case oldconfig: case listnewconfig: