Merge with /home/hs/PanDacom/u-boot-dev

diff --combined CHANGELOG
index 44989b849de6b6f3fef1156563da8519fa328ddd,1b8ae1855a8e4ee5dc9db2939e1ed201bf7b5622..a4b0700dbcd7bf409be920fbe418e46cceffc4b0
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,29 -2,11 +2,32 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Add basic support for the SMMACO4 Board from PanDaCom.
+   Patch by Heiko Schocher, 20 Feb 2006
+ 
 +* Add GIT version information (commid ID) to untagged U-Boot versions
 +
 +  As done in the linux kernel, the U-Boot version (U_BOOT_VERSION)
 +  of all unreleased (untagged) U-Boot images will be automatically
 +  extended upon compiletime with a part of the GIT commit ID and
 +  possibly with "dirty" if uncommited changes are detected.
 +
 +  Here an example for the resulting version:
 +  "U-Boot 1.1.4-g3457ac18-dirty"
 +
 +  The version is now maintained in the toplevel Makefile and the
 +  version headers are autogenerated.
 +
 +  Patch by Stefan Roese, 9 Feb 2006
 +
  * Update default environment for INKA4x00 board.
  
 +* Convert CPCI750 to use common CFI flash driver
 +  Patch by Reinhard Arlt, 8 Feb 2006
 +
 +* Various changes to esd HH405 board specific files
 +  Patch by Matthias Fuchs, 07 Feb 2006
 +
  * Cleanup U-Boot boot messages on ARM.
  
    To match the U-Boot user interface on ARM platforms to the U-Boot

diff --combined Makefile
index 08a8e4670867af31a5c4c26686861a2c730399f7,7e71f9187091c582685f678b49df39064ad92244..cce475c25f2ea53e3f0c9b41d19b012f4f11885b
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  #
 -# (C) Copyright 2000-2005
 +# (C) Copyright 2000-2006
  # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  #
  # See file CREDITS for list of people who contributed to this
@@@ -21,13 -21,6 +21,13 @@@
  # MA 02111-1307 USA
  #
  
 +VERSION = 1
 +PATCHLEVEL = 1
 +SUBLEVEL = 4
 +EXTRAVERSION =
 +U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 +VERSION_FILE = include/version_autogenerated.h
 +
  HOSTARCH := $(shell uname -m | \
        sed -e s/i.86/i386/ \
            -e s/sun4u/sparc64/ \
@@@ -161,14 -154,14 +161,14 @@@ u-boot.bin:     u-boo
  u-boot.img:   u-boot.bin
                ./tools/mkimage -A $(ARCH) -T firmware -C none \
                -a $(TEXT_BASE) -e 0 \
 -              -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' include/version.h | \
 +              -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
  
  u-boot.dis:   u-boot
                $(OBJDUMP) -d $< > $@
  
 -u-boot:               depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
 +u-boot:               depend version $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
                UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
                $(LD) $(LDFLAGS) $$UNDEF_SYM $(OBJS) \
                        --start-group $(LIBS) --end-group $(PLATFORM_LIBS) \
@@@ -180,13 -173,6 +180,13 @@@ $(LIBS)
  $(SUBDIRS):
                $(MAKE) -C $@ all
  
 +version:
 +              @echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \
 +              echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE); \
 +              echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \
 +                       $(TOPDIR)) >> $(VERSION_FILE); \
 +              echo "\"" >> $(VERSION_FILE)
 +
  gdbtools:
                $(MAKE) -C tools/gdb || exit 1
  
@@@ -315,6 -301,6 +315,14 @@@ PM520_ROMBOOT_DDR_config: unconfi
                }
        @./mkconfig -a PM520 ppc mpc5xxx pm520
  
++SMMACO4_config: unconfig
++      @./mkconfig -a SMMACO4 ppc mpc5xxx tqm5200
++
++spieval_config:       unconfig
++      echo "#define CONFIG_CS_AUTOCONF">>include/config.h
++      echo "... with automatic CS configuration"
++      @./mkconfig -a spieval ppc mpc5xxx tqm5200
++
  MINI5200_config       \
  EVAL5200_config       \
  TOP5200_config:       unconfig
@@@ -380,11 -366,14 +388,6 @@@ MiniFAP_config:  unconfi
                }
        @./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
  
 -SMMACO4_config: unconfig
 -      @./mkconfig -a SMMACO4 ppc mpc5xxx tqm5200
 -
--spieval_config:       unconfig
--      echo "#define CONFIG_CS_AUTOCONF">>include/config.h
--      echo "... with automatic CS configuration"
--      @./mkconfig -a spieval ppc mpc5xxx tqm5200
--
  #########################################################################
  ## MPC8xx Systems
  #########################################################################
@@@ -1852,7 -1841,7 +1855,7 @@@ clobber:        clea
                -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
                -print0 \
                | xargs -0 rm -f
 -      rm -f $(OBJS) *.bak tags TAGS
 +      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