Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescale

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 2d7745487b5cd377a378c8ddb2460514af484ec3..69e7a6d57a7aab6d3613726579db79c167957d20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -270,7 +270,7 @@ $(obj)u-boot.img:   $(obj)u-boot.bin
                -d $< $@
 
 $(obj)u-boot.sha1:     $(obj)u-boot.bin
-               ./tools/ubsha1 $(obj)u-boot.bin
+               $(obj)tools/ubsha1 $(obj)u-boot.bin
 
 $(obj)u-boot.dis:      $(obj)u-boot
                $(OBJDUMP) -d $< > $@
@@ -534,6 +534,14 @@ PM520_ROMBOOT_DDR_config:  unconfig
 smmaco4_config: unconfig
        @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200
 
+cm1_qp1_config:        unconfig
+       @ >include/config.h
+       @[ -z "$(findstring cm1_qp1,$@)" ] || \
+               {  echo "... with 64 MByte SDRAM" ; \
+                 echo "... with 32 MByte Flash" ; \
+               }
+       @./mkconfig -a cm1_qp1 ppc mpc5xxx cm1_qp1
+
 spieval_config:        unconfig
        @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200