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

diff --cc CHANGELOG
index a752e01eb3aa0cf4abae19af7b459689605fb50e,f0c1eed8c7f19cb383b29526656ab8263e8b7789..b0ff46e58300ea33247f0c5b1589b185921d3772
--- 1/CHANGELOG
--- 2/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 ea476e3941971bdefc0d95ef4949b93923383fc4,fa7251b3dbb9c1b2c93df83b3b9e41c96b4962d8..7731f0b03e49a3d74025f4b5510afdb1d0fd77cb
--- 1/Makefile
--- 2/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