Merge branch 'master' of git://www.denx.de/git/u-boot into new-image

diff --combined Makefile
index e46ea8502cb5613f231272093d23010e618a96bd,d6a029922d7b09b4c1b9dd328be9c810ac93ee5e..bacea3e3d318610d36e8bde085e6955a9d35fbd6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 1
  PATCHLEVEL = 3
  SUBLEVEL = 2
- EXTRAVERSION = -rc1
+ EXTRAVERSION = -rc2
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
@@@ -244,7 -244,7 +244,7 @@@ LIBS += libfdt/libfdt.
  LIBS += api/libapi.a
  
  LIBS := $(addprefix $(obj),$(LIBS))
- .PHONY : $(LIBS)
+ .PHONY : $(LIBS) $(VERSION_FILE)
  
  # Add GCC lib
  PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
@@@ -326,6 -326,9 +326,9 @@@ $(LIBS):   depend $(obj)include/autoconf.
  $(SUBDIRS):   depend $(obj)include/autoconf.mk
                $(MAKE) -C $@ all
  
+ $(LDSCRIPT):  depend $(obj)include/autoconf.mk
+               $(MAKE) -C $(dir $@) $(notdir $@)
+ 
  $(NAND_SPL):  $(VERSION_FILE) $(obj)include/autoconf.mk
                $(MAKE) -C nand_spl/board/$(BOARDDIR) all
  
@@@ -411,6 -414,7 +414,7 @@@ $(obj)System.map:  $(obj)u-boo
  # to regenerate the autoconf.mk file.
  $(obj)include/autoconf.mk: $(obj)include/config.h $(VERSION_FILE)
        @$(XECHO) Generating include/autoconf.mk ; \
+       set -e ; \
        : Generate the dependancies ; \
        $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep ; \
        : Extract the config macros ; \
@@@ -1921,7 -1925,7 +1925,7 @@@ M5485HFE_config :       unconfi
        M5485EFE_config)        BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
        M5485FFE_config)        BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
        M5485GFE_config)        BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
-       M5485HFE_config)        BOOT=2;CODE=;VID=1;USB=0;RAM=64;RAM1=0;; \
+       M5485HFE_config)        BOOT=2;CODE=16;VID=1;USB=0;RAM=64;RAM1=0;; \
        esac; \
        >include/config.h ; \
        echo "#define CFG_BUSCLK        100000000" > $(obj)include/config.h ; \
@@@ -2921,8 -2925,7 +2925,8 @@@ clobber:        clea
        @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS
        @rm -fr $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
 -      @rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c $(obj)tools/sha1.c
 +      @rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c
 +      @rm -f $(obj)tools/sha1.c $(obj)tools/image.c
        @rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f