Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 19 Mar 2021 19:37:11 +0000
To:     Masahiro Yamada <masahiroy@kernel.org>
From:   Alexander Lobakin <alobakin@pm.me>
Cc:     Alexander Lobakin <alobakin@pm.me>, linux-kbuild@vger.kernel.org,
        linux-kernel@vger.kernel.org
Reply-To: Alexander Lobakin <alobakin@pm.me>
Subject: [PATCH RESEND 1/2] kconfig: fence choices and menuconfigs with comments in .config too
Message-ID: <20210319193705.267922-2-alobakin@pm.me>
In-Reply-To: <20210319193705.267922-1-alobakin@pm.me>
References: <20210319193705.267922-1-alobakin@pm.me>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Comment blocks are now generated in .config only for menus. Provide
them for choices and menuconfigs too to greatly improve dotconfig
readability.

Choices before:

x CONFIG_BOOT_CONFIG is not set
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=3Dy
x CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=3Dy

Choices after:

x CONFIG_BOOT_CONFIG is not set

x
x Compiler optimization level
x
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=3Dy
x CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
x end of Compiler optimization level

CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=3Dy

Menuconfigs before:

x CONFIG_IPACK_BUS is not set
CONFIG_RESET_CONTROLLER=3Dy
x CONFIG_RESET_BRCMSTB_RESCAL is not set
x CONFIG_RESET_INTEL_GW is not set
x CONFIG_RESET_TI_SYSCON is not set

Menuconfigs after:

x
x IndustryPack bus support
x
x CONFIG_IPACK_BUS is not set
x end of IndustryPack bus support

x
x Reset Controller Support
x
CONFIG_RESET_CONTROLLER=3Dy
x CONFIG_RESET_BRCMSTB_RESCAL is not set
x CONFIG_RESET_INTEL_GW is not set
x CONFIG_RESET_TI_SYSCON is not set
x end of Reset Controller Support

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 scripts/kconfig/confdata.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 2568dbe16ed6..e4f0a21fd469 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -869,17 +869,20 @@ int conf_write(const char *name)
 =09menu =3D rootmenu.list;
 =09while (menu) {
 =09=09sym =3D menu->sym;
-=09=09if (!sym) {
-=09=09=09if (!menu_is_visible(menu))
-=09=09=09=09goto next;
+
+=09=09if ((!sym || (sym->flags & SYMBOL_CHOICE) ||
+=09=09     (menu->prompt && menu->prompt->type =3D=3D P_MENU)) &&
+=09=09    menu_is_visible(menu)) {
 =09=09=09str =3D menu_get_prompt(menu);
 =09=09=09fprintf(out, "\n"
 =09=09=09=09     "#\n"
 =09=09=09=09     "# %s\n"
 =09=09=09=09     "#\n", str);
 =09=09=09need_newline =3D false;
-=09=09} else if (!(sym->flags & SYMBOL_CHOICE) &&
-=09=09=09   !(sym->flags & SYMBOL_WRITTEN)) {
+=09=09}
+
+=09=09if (sym && !(sym->flags & SYMBOL_CHOICE) &&
+=09=09    !(sym->flags & SYMBOL_WRITTEN)) {
 =09=09=09sym_calc_value(sym);
 =09=09=09if (!(sym->flags & SYMBOL_WRITE))
 =09=09=09=09goto next;
@@ -896,11 +899,11 @@ int conf_write(const char *name)
 =09=09=09menu =3D menu->list;
 =09=09=09continue;
 =09=09}
-=09=09if (menu->next)
-=09=09=09menu =3D menu->next;
-=09=09else while ((menu =3D menu->parent)) {
-=09=09=09if (!menu->sym && menu_is_visible(menu) &&
-=09=09=09    menu !=3D &rootmenu) {
+
+=09=09do {
+=09=09=09if (((menu->sym && menu->sym->flags & SYMBOL_CHOICE) ||
+=09=09=09     (menu->prompt && menu->prompt->type =3D=3D P_MENU)) &&
+=09=09=09    menu_is_visible(menu) && menu !=3D &rootmenu) {
 =09=09=09=09str =3D menu_get_prompt(menu);
 =09=09=09=09fprintf(out, "# end of %s\n", str);
 =09=09=09=09need_newline =3D true;
@@ -909,7 +912,7 @@ int conf_write(const char *name)
 =09=09=09=09menu =3D menu->next;
 =09=09=09=09break;
 =09=09=09}
-=09=09}
+=09=09} while ((menu =3D menu->parent));
 =09}
 =09fclose(out);

--
2.31.0