scripts: remove CONFIG_IS_ENABLED and CONFIG_VAL in generated u_boot.cfg

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>

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 8a3efdb..5ed9abc 100644 (file)
--- 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;                                       \