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

diff --combined Makefile
index cf3fbcb,2ff3e06..4e2cd04
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -34,6 -34,7 +34,7 @@@ HOSTARCH := $(shell uname -m | 
            -e s/arm.*/arm/ \
            -e s/sa110/arm/ \
            -e s/powerpc/ppc/ \
+           -e s/ppc64/ppc/ \
            -e s/macppc/ppc/)
  
  HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
@@@ -533,8 -534,13 +534,8 @@@ 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
 +cm5200_config:        unconfig
 +      @./mkconfig -a cm5200 ppc mpc5xxx cm5200
  
  spieval_config:       unconfig
        @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200