patman: Convert camel case in checkpatch.py

[platform/kernel/u-boot.git] / scripts / Makefile.autoconf

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 2f85eb9..0b3ffa0 100644 (file)
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # This helper makefile is used for creating
 #  - symbolic links (arch/$ARCH/include/asm/arch
 #  - include/autoconf.mk, {spl,tpl}/include/autoconf.mk
@@ -6,9 +7,6 @@
 # When our migration to Kconfig is done
 # (= When we move all CONFIGs from header files to Kconfig)
 # this makefile can be deleted.
-#
-# SPDX-License-Identifier:     GPL-2.0
-#
 
 __all: include/autoconf.mk include/autoconf.mk.dep
 
@@ -63,13 +61,14 @@ quiet_cmd_autoconf = GEN     $@
                        if [ -n "${KCONFIG_IGNORE_DUPLICATES}" ] ||                     \
                           ! grep -q "$${line%=*}=" include/config/auto.conf; then      \
                                echo "$$line";                                          \
-                       fi                                                              \
+                       fi;                                                             \
                done > $@
 
 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_IF_ENABLED_INT(/d;/define CONFIG_VAL(/d;' > $@; \
                rm $@.tmp;                                              \
        } || {                                                          \
                rm $@.tmp; false;                                       \
@@ -106,10 +105,10 @@ define filechk_config_h
                | sed '/=/ {s/=/        /;q; } ; { s/$$/        1/; }'; \
        done;                                                           \
        echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
-       echo \#include \<config_defaults.h\>;                           \
        echo \#include \<config_uncmd_spl.h\>;                          \
        echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;         \
        echo \#include \<asm/config.h\>;                                \
+       echo \#include \<linux/kconfig.h\>;                             \
        echo \#include \<config_fallbacks.h\>;)
 endef