Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 82d3ab409ae1d6f167aecd52f31c2945ae7eed14..279086509df5b4919d55ef477358e80ae02a3af4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -414,6 +414,7 @@ $(obj)System.map:   $(obj)u-boot
 # 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 ; \
@@ -1924,7 +1925,7 @@ M5485HFE_config : unconfig
        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 ; \