[new uImage] Fix autoscr command used with new uImage format

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index f0d2227f99aa2c03c3944141fa41de219ae43b65..3bb8a74dacfaf7e9d07e575f631b061ad37db04f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1937,7 +1937,7 @@ M5485HFE_config : unconfig
 MPC8313ERDB_33_config \
 MPC8313ERDB_66_config: unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) -n "...33M ..." ; \
                echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
@@ -1959,7 +1959,7 @@ MPC832XEMDS_HOST_66_config \
 MPC832XEMDS_SLAVE_config \
 MPC832XEMDS_ATM_config:        unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
@@ -2008,7 +2008,7 @@ MPC8360EMDS_HOST_66_config \
 MPC8360EMDS_SLAVE_config \
 MPC8360EMDS_ATM_config: unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
@@ -2038,7 +2038,7 @@ MPC8360ERDK_33_config \
 MPC8360ERDK_66_config \
 MPC8360ERDK_config:    unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) -n "... CLKIN 33MHz " ; \
                echo "#define CONFIG_CLKIN_33MHZ" >>$(obj)include/config.h ;\
        fi ;
@@ -2047,7 +2047,7 @@ MPC8360ERDK_config:       unconfig
 MPC837XEMDS_config \
 MPC837XEMDS_HOST_config:       unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ;
@@ -2079,7 +2079,7 @@ MPC8540EVAL_66_config \
 MPC8540EVAL_33_slave_config \
 MPC8540EVAL_66_slave_config:     unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) "... 33 MHz PCI" ; \
        else \
                echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
@@ -2099,7 +2099,7 @@ MPC8560ADS_config:        unconfig
 MPC8541CDS_legacy_config \
 MPC8541CDS_config:     unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2111,7 +2111,7 @@ MPC8544DS_config: unconfig
 MPC8548CDS_legacy_config \
 MPC8548CDS_config:     unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2120,7 +2120,7 @@ MPC8548CDS_config:        unconfig
 MPC8555CDS_legacy_config \
 MPC8555CDS_config:     unconfig
        @mkdir -p $(obj)include
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2578,6 +2578,7 @@ omap2420h4_config : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4
 
 apollon_config         : unconfig
+       @mkdir -p $(obj)include
        @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm1136 apollon
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
@@ -2872,7 +2873,9 @@ clobber:  clean
        @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
-       @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,sha1.c,inca-swap-bytes}
+       @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
+       @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c}
+       @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
        @rm -f $(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