Merge with /home/stefan/git/u-boot/denx

[u-boot] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 0f4b4d561e9d9e7172128ed29a97d2e5eea4067c..e5fa93bc052472efeef54f5c64d0318981184838 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,16 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Remove compile warnings in fpga code
+  Patch by Stefan Roese, 18 Sep 2006
+
+* Add initial support for the ALPR board from Prodrive
+  NAND needs some additional testing
+  Patch by Heiko Schocher, 15 Aug 2006
+
+* Add FPGA Altera Cyclone 2 support
+  Patch by Heiko Schocher, 15 Aug 2006
+
 * Disable autoboot abort for FO300 when silent mode is enabled
   (according to S1 switch setting).