All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg
@ 2021-11-08  9:21 Patrick Delaunay
  2021-11-08  9:21 ` [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt Patrick Delaunay
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Patrick Delaunay @ 2021-11-08  9:21 UTC (permalink / raw)
  To: u-boot; +Cc: Patrick Delaunay, U-Boot STM32

The two helpers macros CONFIG_IS_ENABLED and CONFIG_VAL are defined in
include/linux/kconfig.h but they are not real configurations; they can
be safely removed in the generated configuration file "u-boot.cfg".

This patch simplifies the comparison of this U-Boot configuration file.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

 scripts/Makefile.autoconf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 0bfc1b2a62..9bf72784c4 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -67,7 +67,8 @@ quiet_cmd_autoconf = GEN     $@
 quiet_cmd_u_boot_cfg = CFG     $@
       cmd_u_boot_cfg = \
 	$(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
-		grep 'define CONFIG_' $@.tmp > $@;			\
+		grep 'define CONFIG_' $@.tmp | \
+			sed '/define CONFIG_IS_ENABLED(/d;/define CONFIG_VAL(/d;' > $@; \
 		rm $@.tmp;						\
 	} || {								\
 		rm $@.tmp; false;					\
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt
  2021-11-08  9:21 [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg Patrick Delaunay
@ 2021-11-08  9:21 ` Patrick Delaunay
  2021-11-25  0:11   ` Simon Glass
  2021-12-02 12:14   ` Tom Rini
  2021-11-25  0:11 ` [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg Simon Glass
  2021-12-02 12:14 ` Tom Rini
  2 siblings, 2 replies; 6+ messages in thread
From: Patrick Delaunay @ 2021-11-08  9:21 UTC (permalink / raw)
  To: u-boot
  Cc: Patrick Delaunay, Marek Behún, Priyanka Jain, Simon Glass,
	Stefan Roese, U-Boot STM32

The helper macro CONFIG_IS_ENABLED and CONFIG_VAL are not real
configurations and they are no more present in u-boot.cfg so they can
be removed in config_whitelist.txt.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---

 scripts/config_whitelist.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6792e284a1..cc2e241417 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -634,7 +634,6 @@ CONFIG_IRAM_SIZE
 CONFIG_IRAM_STACK
 CONFIG_IRAM_TOP
 CONFIG_IRDA_BASE
-CONFIG_IS_ENABLED
 CONFIG_JFFS2_DEV
 CONFIG_JFFS2_LZO
 CONFIG_JFFS2_NAND
@@ -3051,7 +3050,6 @@ CONFIG_USE_ONENAND_BOARD_INIT
 CONFIG_UTBIPAR_INIT_TBIPA
 CONFIG_U_BOOT_HDR_ADDR
 CONFIG_U_BOOT_HDR_SIZE
-CONFIG_VAL
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
 CONFIG_VIDEO_BCM2835
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg
  2021-11-08  9:21 [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg Patrick Delaunay
  2021-11-08  9:21 ` [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt Patrick Delaunay
@ 2021-11-25  0:11 ` Simon Glass
  2021-12-02 12:14 ` Tom Rini
  2 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2021-11-25  0:11 UTC (permalink / raw)
  To: Patrick Delaunay; +Cc: u-boot, U-Boot STM32

On Mon, 8 Nov 2021 at 02:21, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> The two helpers macros CONFIG_IS_ENABLED and CONFIG_VAL are defined in
> include/linux/kconfig.h but they are not real configurations; they can
> be safely removed in the generated configuration file "u-boot.cfg".
>
> This patch simplifies the comparison of this U-Boot configuration file.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  scripts/Makefile.autoconf | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt
  2021-11-08  9:21 ` [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt Patrick Delaunay
@ 2021-11-25  0:11   ` Simon Glass
  2021-12-02 12:14   ` Tom Rini
  1 sibling, 0 replies; 6+ messages in thread
From: Simon Glass @ 2021-11-25  0:11 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: u-boot, Marek Behún, Priyanka Jain, Stefan Roese, U-Boot STM32

On Mon, 8 Nov 2021 at 02:21, Patrick Delaunay
<patrick.delaunay@foss.st.com> wrote:
>
> The helper macro CONFIG_IS_ENABLED and CONFIG_VAL are not real
> configurations and they are no more present in u-boot.cfg so they can
> be removed in config_whitelist.txt.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>
>  scripts/config_whitelist.txt | 2 --
>  1 file changed, 2 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg
  2021-11-08  9:21 [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg Patrick Delaunay
  2021-11-08  9:21 ` [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt Patrick Delaunay
  2021-11-25  0:11 ` [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg Simon Glass
@ 2021-12-02 12:14 ` Tom Rini
  2 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2021-12-02 12:14 UTC (permalink / raw)
  To: Patrick Delaunay; +Cc: u-boot, U-Boot STM32

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

On Mon, Nov 08, 2021 at 10:21:21AM +0100, Patrick Delaunay wrote:

> The two helpers macros CONFIG_IS_ENABLED and CONFIG_VAL are defined in
> include/linux/kconfig.h but they are not real configurations; they can
> be safely removed in the generated configuration file "u-boot.cfg".
> 
> This patch simplifies the comparison of this U-Boot configuration file.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt
  2021-11-08  9:21 ` [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt Patrick Delaunay
  2021-11-25  0:11   ` Simon Glass
@ 2021-12-02 12:14   ` Tom Rini
  1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2021-12-02 12:14 UTC (permalink / raw)
  To: Patrick Delaunay
  Cc: u-boot, Marek Behún, Priyanka Jain, Simon Glass,
	Stefan Roese, U-Boot STM32

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

On Mon, Nov 08, 2021 at 10:21:22AM +0100, Patrick Delaunay wrote:

> The helper macro CONFIG_IS_ENABLED and CONFIG_VAL are not real
> configurations and they are no more present in u-boot.cfg so they can
> be removed in config_whitelist.txt.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-12-02 12:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-08  9:21 [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg Patrick Delaunay
2021-11-08  9:21 ` [PATCH 2/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in config_whitelist.txt Patrick Delaunay
2021-11-25  0:11   ` Simon Glass
2021-12-02 12:14   ` Tom Rini
2021-11-25  0:11 ` [PATCH 1/2] scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg Simon Glass
2021-12-02 12:14 ` Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.