Merge branch 'for-1.3.2'

[kernel/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index b3a1d2f..5f2dea0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -253,9 +253,7 @@ LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
        "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
 LIBS += common/libcommon.a
 LIBS += libfdt/libfdt.a
-ifeq ($(CONFIG_API),y)
 LIBS += api/libapi.a
-endif
 
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS)
@@ -266,11 +264,8 @@ PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -
 # The "tools" are needed early, so put this first
 # Don't include stuff already done in $(LIBS)
 SUBDIRS        = tools \
-         examples
-
-ifeq ($(CONFIG_API),y)
-SUBDIRS += api_examples
-endif
+         examples \
+         api_examples
 
 .PHONY : $(SUBDIRS)
 
@@ -317,13 +312,13 @@ $(obj)u-boot:             depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
 
-$(OBJS):       $(obj)include/autoconf.mk
+$(OBJS):       depend $(obj)include/autoconf.mk
                $(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@))
 
-$(LIBS):       $(obj)include/autoconf.mk
+$(LIBS):       depend $(obj)include/autoconf.mk
                $(MAKE) -C $(dir $(subst $(obj),,$@))
 
-$(SUBDIRS):    $(obj)include/autoconf.mk
+$(SUBDIRS):    depend $(obj)include/autoconf.mk
                $(MAKE) -C $@ all
 
 $(NAND_SPL):   $(VERSION_FILE) $(obj)include/autoconf.mk
@@ -2469,20 +2464,8 @@ versatileab_config       \
 versatilepb_config :   unconfig
        @board/versatile/split_by_variant.sh $@
 
-voiceblue_smallflash_config    \
 voiceblue_config:      unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/voiceblue
-       @if [ "$(findstring _smallflash_,$@)" ] ; then \
-               $(XECHO) "... boot from lower flash bank" ; \
-               echo "#define VOICEBLUE_SMALL_FLASH" >>$(obj)include/config.h ; \
-               echo "VOICEBLUE_SMALL_FLASH=y" >$(obj)board/voiceblue/config.tmp ; \
-       else \
-               $(XECHO) "... boot from upper flash bank" ; \
-               >$(obj)include/config.h ; \
-               echo "VOICEBLUE_SMALL_FLASH=n" >$(obj)board/voiceblue/config.tmp ; \
-       fi
-       @$(MKCONFIG) -a voiceblue arm arm925t voiceblue
+       @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
 
 cm4008_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cm4008 NULL ks8695