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

diff --cc CHANGELOG
index e008c04,7eb78c2..bbd0636
--- 1/CHANGELOG
--- 2/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.

diff --cc MAKEALL
Simple merge