From: Wolfgang Denk <wd@pollux.(none)>
Date: Wed, 22 Feb 2006 00:59:13 +0000 (+0100)
Subject: Merge with /home/hs/PanDacom/u-boot-dev
X-Git-Tag: LABEL_2006_03_12_0025~28^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9cdc838613aa35617004486f2f2872be6b20b786;p=oweals%2Fu-boot.git

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

9cdc838613aa35617004486f2f2872be6b20b786
diff --cc CHANGELOG
index 44989b849d,1b8ae1855a..a4b0700dbc
--- a/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 --cc Makefile
index 08a8e46708,7e71f91870..cce475c25f
--- a/Makefile
+++ b/Makefile
@@@ -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
  #########################################################################