Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --combined Makefile
index ec8661ad89863b047e2982713c431e42619807f9,3e7cffcd3427e67541dad057738fee4b521ab96d..852dca865c1eaadaed4530f138ab8fd8806f7606
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -253,9 -253,7 +253,7 @@@ LIBS += $(shell if [ -d post/board/$(BO
        "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 +264,8 @@@ PLATFORM_LIBS += -L $(shell dirname `$(
  # 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)
  
@@@ -2467,8 -2462,20 +2462,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