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

[karo-tx-uboot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index facc6c297c011e4a11a645fc1fd5c02c243c0e6f..b79ffbe9cf656dd6a5eb480ca3047bc0dd6b2a53 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix examples/Makefile; some build targets were lost
+  
+* Fix watchdog handling in CFI flash driver
+  Just use udelay() when waiting for status changes which will
+  implicitely trigger the watchdog.
+
 * Fix PCI to memory window size problems on PM82x boards
   We use the "automatic" mode that was used for  the  MPC8266ADS  and
   MPC8272 boards. Eventually this should be used on all boards?]