Merge with /home/tur/git/u-boot#cm1_qp1

diff --combined Makefile
index c45700e08d6664f0066934b7b4cd0650d9db07de,9c1a0b2a37e988baf20d27bcf0881dcfba80fd40..bfa38460daefaa52c96d42b745b85255b273df37
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -247,7 -247,7 +247,7 @@@ __LIBS := $(subst $(obj),,$(LIBS)
  #########################################################################
  #########################################################################
  
 -ALL = $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
 +ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
  
  all:          $(ALL)
  
@@@ -267,9 -267,6 +267,9 @@@ $(obj)u-boot.img:  $(obj)u-boot.bi
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
  
 +$(obj)u-boot.sha1:    $(obj)u-boot.bin
 +              $(obj)./tools/ubsha1 $(obj)u-boot.bin
 +
  $(obj)u-boot.dis:     $(obj)u-boot
                $(OBJDUMP) -d $< > $@
  
@@@ -532,6 -529,14 +532,14 @@@ PM520_ROMBOOT_DDR_config:        unconfi
  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
  
@@@ -2463,7 -2468,7 +2471,7 @@@ clean
              $(obj)examples/smc91111_eeprom $(obj)examples/interrupt \
              $(obj)examples/test_burst
        rm -f $(obj)tools/img2srec $(obj)tools/mkimage $(obj)tools/envcrc \
 -              $(obj)tools/gen_eth_addr
 +              $(obj)tools/gen_eth_addr $(obj)tools/ubsha1
        rm -f $(obj)tools/mpc86x_clk $(obj)tools/ncb
        rm -f $(obj)tools/easylogo/easylogo $(obj)tools/bmp_logo
        rm -f $(obj)tools/gdb/astest $(obj)tools/gdb/gdbcont $(obj)tools/gdb/gdbsend
@@@ -2486,7 -2491,7 +2494,7 @@@ clobber:        clea
        rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS $(obj)include/version_autogenerated.h
        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
 +      rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c $(obj)tools/sha1.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 $(OBJTREE)/nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f