From e6ba3c92ceefc2f3f7f41b59640272d8a462bb46 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 1 Apr 2005 09:29:14 +0000
Subject: [PATCH] Patch by Martin Krause, 01 Apr 2005: Fix flash erase timeout
 on CMC_PU2

---
 CHANGELOG                 | 3 +++
 include/configs/cmc_pu2.h | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9bdace71aa..f6dd42853d 100644
--- 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 a9742c19b2..b483151d04 100644
--- 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 */
-- 
2.25.1