From: Wolfgang Denk <wd@pollux.denx.de>
Date: Tue, 9 Aug 2005 15:38:59 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: LABEL_2006_03_12_0025~226^2~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d;p=u-boot

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

38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d
diff --cc CHANGELOG
index 5296daf03e,51974add95..6bd7329d4a
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,11 +2,13 @@@
  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
  
    Old, obsolete and duplicated code was cleaned up and replace by the