From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 20 Oct 2006 10:02:47 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot/440epx-boot-msg
X-Git-Tag: U-Boot-1_1_5~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a0d3518460150b7c07c64e1abbbc71cbc591055f;p=oweals%2Fu-boot.git

Merge with /home/sr/git/u-boot/440epx-boot-msg
---

a0d3518460150b7c07c64e1abbbc71cbc591055f
diff --cc CHANGELOG
index da785f4ba8,1092d30e68..71096e875f
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,9 +2,11 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Make 4xx bootup message shorter on 440EPx/GRx platforms
+   Patch by Stefan Roese, 18 Oct 2006
+ 
 +* Add (preliminary) support for V38B board
 +
  * PPC405EP: Add support for board configuration of CPC0_PCI register
    This is needed to be able to configure PerWE*/PCI_INT* pin as PerWE*
    Patch by Tolunay Orkun, 07 Apr 2006