Merge with git+ssh://fifi/home/wd/git/u-boot/master

[platform/kernel/u-boot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 206c441..ff6eadb 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Update for SC520 board.
+  Patch by David Updegraff, 02 Dec 2005
+
 * Fixed common.h spelling error.
   Patch by Cory Tusar, 30 Nov 2005
 
@@ -14,6 +17,12 @@ Changes since U-Boot 1.1.4:
 * Fix drivers/dm9000.c when configured in 32 bit mode.
   Patch by Eric Benard, 17 Nov 2005
 
+* Cleanup debug code for yucca board.
+
+* MCC200: restrict addressable flash space to 32 MB
+
+* Add debug console on COM12 for MCC200 board
+
 * Fix control-c handing in CONFIG_CMDLINE_EDITING
   Properly pass break code back from readline.
   Patch by Roger Blofeld, 31 Jul 2006