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

[oweals/u-boot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 5296daf03e1d15143be9ee6858149fee9f0b46d5..6bd7329d4af0e9e751c5975d3d1e2c506945249d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Changed CONFIG_440_GX, CONFIG_440_EP and CONFIG_440_GR options to
+  CONFIG_44GX, CONFIG_440EP and CONFIG_440GR for a consistent design
+  with the 405 defines and the linux kernel defines.
+  Patch by Stefan Roese, 08 Aug 2005
+
 * Fix compiler warnings with older GCC versions
 
 * Add common (with Linux) MTD partition scheme and "mtdparts" command
@@ -36,13 +41,13 @@ Changes for U-Boot 1.1.3:
 
 * Fix errors that occur when accessing SystemACE CF
   Patch by Jeff Angielski, 09 Jan 2005
-  
+
 * Document switching between U-Boot and PlanetCore on RPXlite
   by Sam Song, 24 Dec 2004
 
 * Fix PowerQUICC II mask detection.
   Patch by Eugene Surovegin, 20 Dec 2004
-  
+
 * Add support for Altera NIOS DK1C20 board
   Patch by Shlomo Kut, 13 Dec 2004