Patch by Martin Krause, 01 Apr 2005:

Fix flash erase timeout on CMC_PU2

diff --git a/CHANGELOG b/CHANGELOG
index 9bdace7..f6dd428 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Patch by Martin Krause, 01 Apr 2005:
+  Fix flash erase timeout on CMC_PU2
+
 * Patch by Steven Scholz, 13 March 2005:
   fix cache enabling for AT91RM9200
 

diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index a9742c1..b483151 100644 (file)
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -170,8 +170,8 @@
 #define CFG_MONITOR_BASE               CFG_FLASH_BASE
 #define CFG_MAX_FLASH_BANKS            1
 #define CFG_MAX_FLASH_SECT             256
-#define CFG_FLASH_ERASE_TOUT           (2*CFG_HZ) /* Timeout for Flash Erase */
-#define CFG_FLASH_WRITE_TOUT           (2*CFG_HZ) /* Timeout for Flash Write */
+#define CFG_FLASH_ERASE_TOUT           (11 * CFG_HZ)   /* Timeout for Flash Erase */
+#define CFG_FLASH_WRITE_TOUT           ( 2 * CFG_HZ)   /* Timeout for Flash Write */
 
 #define CFG_ENV_IS_IN_FLASH            1
 #define CFG_ENV_OFFSET                 0x20000         /* after u-boot.bin */