From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 30 Jun 2006 17:32:25 +0000 (+0200)
Subject: Merge with /home/m8/git/u-boot
X-Git-Tag: LABEL_2006_06_30_2020~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3b5f61a02579026f0588b5dac3bb1c507b6fa53f;p=u-boot

Merge with /home/m8/git/u-boot
---

3b5f61a02579026f0588b5dac3bb1c507b6fa53f
diff --cc CHANGELOG
index e008c04afb,7eb78c23a2..bbd0636fdf
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,10 +2,12 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix CONFIG_440_GX define usage.
+ 
+ * Remove autogenerated bmp_logo.h file.
+ 
 +* Cleanup trab board for GCC-4.x
 +
  * VoiceBlue update: use new MTD flash partitioning methods, use more
    reasonable TEXT_BASE, update default environment and enable keyed
    autoboot.