arm: armada: dts: Add clock to armada-ap80x uart1

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

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 8a3efdb..5a4a148 100644 (file)
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -18,6 +18,10 @@ ifeq ($(shell grep -q '^CONFIG_TPL=y' include/config/auto.conf 2>/dev/null && ec
 __all: tpl/include/autoconf.mk
 endif
 
+ifeq ($(shell grep -q '^CONFIG_VPL=y' include/config/auto.conf 2>/dev/null && echo y),y)
+__all: vpl/include/autoconf.mk
+endif
+
 include include/config/auto.conf
 
 include scripts/Kbuild.include
@@ -67,7 +71,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_IF_ENABLED_INT(/d;/define CONFIG_VAL(/d;' > $@; \
                rm $@.tmp;                                              \
        } || {                                                          \
                rm $@.tmp; false;                                       \
@@ -84,6 +89,10 @@ tpl/u-boot.cfg: include/config.h FORCE
        $(Q)mkdir -p $(dir $@)
        $(call cmd,u_boot_cfg,-DCONFIG_SPL_BUILD -DCONFIG_TPL_BUILD)
 
+vpl/u-boot.cfg: include/config.h FORCE
+       $(Q)mkdir -p $(dir $@)
+       $(call cmd,u_boot_cfg,-DCONFIG_SPL_BUILD -DCONFIG_VPL_BUILD)
+
 include/autoconf.mk: u-boot.cfg
        $(call cmd,autoconf)
 
@@ -95,14 +104,14 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg
        $(Q)mkdir -p $(dir $@)
        $(call cmd,autoconf)
 
+vpl/include/autoconf.mk: vpl/u-boot.cfg
+       $(Q)mkdir -p $(dir $@)
+       $(call cmd,autoconf)
+
 # include/config.h
 # Prior to Kconfig, it was generated by mkconfig. Now it is created here.
 define filechk_config_h
        (echo "/* Automatically generated - do not edit */";            \
-       for i in $$(echo $(CONFIG_SYS_EXTRA_OPTIONS) | sed 's/,/ /g'); do \
-               echo \#define CONFIG_$$i                                \
-               | sed '/=/ {s/=/        /;q; } ; { s/$$/        1/; }'; \
-       done;                                                           \
        echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
        echo \#include \<config_uncmd_spl.h\>;                          \
        echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;         \