From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 11 Aug 2005 22:22:49 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: LABEL_2006_03_12_0025~214^2~5^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dafba16e6fc1837381c8e74c4891ad6965cf54ab;p=u-boot

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

dafba16e6fc1837381c8e74c4891ad6965cf54ab
diff --cc CHANGELOG
index a752e01eb3,f0c1eed8c7..b0ff46e583
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,11 -2,16 +2,21 @@@
  Changes for U-Boot 1.1.3:
  ======================================================================
  
+ * Update AMCC Yosemite to get a consistent setup for all AMCC eval
+   boards (baudrate, environment...). Flash driver fixed.
+   Patch by Stefan Roese, 11 Aug 2005
+ 
+ * Changed AMCC Bubinga (405EP) configuration to support 2nd eth port
+   Patch by Stefan Roese, 11 Aug 2005
+ 
+ * Add NAND FLASH support for AMCC Bamboo 440EP eval board
+   Patch by Stefan Roese, 11 Aug 2005
+ 
 +* Add configuration for IFM AEV FIFO board.
 +  Minor coding style cleanup.
 +
 +* Add configuration for IFM SPI eval board
 +
  * Fix CompactFlash problem on HMI1001 board
  
  * Make new "mtdparts" code build with older compilers
diff --cc Makefile
index ea476e3941,fa7251b3db..7731f0b03e
--- a/Makefile
+++ b/Makefile
@@@ -231,6 -231,6 +231,9 @@@ PATI_config:		unconfi
  ## MPC5xxx Systems
  #########################################################################
  
++aev_config: unconfig
++	@./mkconfig -a aev ppc mpc5xxx tqm5200
++
  hmi1001_config:         unconfig
  	@./mkconfig hmi1001 ppc mpc5xxx hmi1001