Merge with /home/wd/git/u-boot/master

[platform/kernel/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 26f5ae6..67eb0dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -295,14 +295,23 @@ icecube_5100_config:                      unconfig
                }
        @./mkconfig -a IceCube ppc mpc5xxx icecube
 
-inka4x0_config:                unconfig
+inka4x0_config:        unconfig
        @./mkconfig inka4x0 ppc mpc5xxx inka4x0
 
+mcc200_config  \
+mcc200_lowboot_config: unconfig
+       @ >include/config.h
+       @[ -z "$(findstring lowboot_,$@)" ] || \
+               { echo "TEXT_BASE = 0xFE000000" >board/mcc200/config.tmp ; \
+                 echo "... with lowboot configuration" ; \
+               }
+       @./mkconfig mcc200 ppc mpc5xxx mcc200
+
 o2dnt_config:
-       @./mkconfig -a o2dnt ppc mpc5xxx o2dnt
+       @./mkconfig o2dnt ppc mpc5xxx o2dnt
 
 pf5200_config:  unconfig
-       @./mkconfig -a pf5200  ppc mpc5xxx pf5200 esd
+       @./mkconfig pf5200  ppc mpc5xxx pf5200 esd
 
 PM520_config \
 PM520_DDR_config \
@@ -1870,15 +1879,13 @@ clean:
        rm -f board/cray/L1/bootscript.c board/cray/L1/bootscript.image
        rm -f board/trab/trab_fkt board/voiceblue/eeprom
        rm -f board/integratorap/u-boot.lds board/integratorcp/u-boot.lds
-       rm -f u-boot.objdump-*
 
 clobber:       clean
        find . -type f \( -name .depend \
                -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
                -print0 \
                | xargs -0 rm -f
-       rm -f $(OBJS) *.bak tags include/version_autogenerated.h
-
+       rm -f $(OBJS) *.bak tags TAGS include/version_autogenerated.h
        rm -fr *.*~
        rm -f u-boot u-boot.map u-boot.hex $(ALL)
        rm -f tools/crc32.c tools/environment.c tools/env/crc32.c