Merge branch 'r-ml-master' into t-master

diff --combined Makefile
index 255c3b646ead9b8459b5fb08c1f814d06daa5154,2403ad97c3bfd60e931be722a9283b28d52dd80d..0f609253e3725f0c2f54c25479857c23b8603a9e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -398,8 -398,11 +398,11 @@@ updater
  env:
                $(MAKE) -C tools/env all MTD_VERSION=${MTD_VERSION} || exit 1
  
+ # Explicitly make _depend in subdirs containing multiple targets to prevent
+ # parallel sub-makes creating .depend files simultaneously.
  depend dep:   $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
-               for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
+               for dir in $(SUBDIRS) cpu/$(CPU) $(dir $(LDSCRIPT)) ; do \
+                       $(MAKE) -C $$dir _depend ; done
  
  TAG_SUBDIRS = $(SUBDIRS)
  TAG_SUBDIRS += $(dir $(__LIBS))
@@@ -448,10 -451,15 +451,15 @@@ $(obj)include/autoconf.mk: $(obj)includ
  else  # !config.mk
  all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
  $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
- $(SUBDIRS) $(TIMESTAMP_FILE) $(VERSION_FILE) gdbtools updater env depend \
- dep tags ctags etags cscope $(obj)System.map:
+ $(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) $(VERSION_FILE) gdbtools \
+ updater env depend dep tags ctags etags cscope $(obj)System.map:
        @echo "System not configured - see README" >&2
        @ exit 1
+ 
+ tools:
+       $(MAKE) -C tools
+ tools-all:
+       $(MAKE) -C tools HOST_TOOLS_ALL=y
  endif # config.mk
  
  .PHONY : CHANGELOG
@@@ -2703,7 -2711,7 +2711,7 @@@ mp2usb_config   :       unconfi
        @$(MKCONFIG) $(@:_config=) arm arm920t mp2usb NULL at91rm9200
  
  #########################################################################
- ## Atmel ARM926EJ-S Systems
+ ## ARM926EJ-S Systems
  #########################################################################
  
  afeb9260_config:      unconfig
@@@ -3028,14 -3036,6 +3036,14 @@@ smdk2400_config       :       unconfi
  smdk2410_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 samsung s3c24x0
  
 +spear300_config \
 +spear310_config \
 +spear320_config :     unconfig
 +      @$(MKCONFIG) -n $@ -t $(@:_config=) spear3xx arm arm926ejs $(@:_config=) spear spear
 +
 +spear600_config :     unconfig
 +      @$(MKCONFIG) -n $@ -t $(@:_config=) spear6xx arm arm926ejs $(@:_config=) spear spear
 +
  SX1_stdout_serial_config \
  SX1_config:           unconfig
        @mkdir -p $(obj)include