Update ep8260: Fix flash timeouts; improve clock resolution for faster UARTs

Patch by Jeff Angielski, 21 Feb 2005

diff --git a/CHANGELOG b/CHANGELOG
index e189bbb0ad9627154fc15f196b4df32bbd9a23bf..ff659f421a756b4c977d6c160af0fc8125523728 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Update ep8260: Fix flash timeouts; improve clock resolution for faster UARTs
+  Patch by Jeff Angielski, 21 Feb 2005 
+    
 * Fix au1x00_serial baud rate calculation:
   remove hardcoded cpu clock divisor and use register instead;
   round up instead of truncate

diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index e7b081800ef72a1d8d4451f8770fb6985f9fdfa0..686251930918bf87afcca4ff66d5b0073a0de2cb 100644 (file)
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -466,8 +466,13 @@
 #define CFG_MAX_FLASH_SECT    71      /* max number of sectors on one chip  */
 #endif
 
+#ifdef CFG_EP8260_H2
+#define CFG_FLASH_ERASE_TOUT  240000  /* Timeout for Flash Erase (in ms)    */
+#define CFG_FLASH_WRITE_TOUT  500     /* Timeout for Flash Write (in ms)    */
+#else
 #define CFG_FLASH_ERASE_TOUT  8000    /* Timeout for Flash Erase (in ms)    */
 #define CFG_FLASH_WRITE_TOUT  1       /* Timeout for Flash Write (in ms)    */
+#endif
 
 #ifndef CFG_RAMBOOT
 #  define CFG_ENV_IS_IN_FLASH  1
@@ -607,7 +612,11 @@
  * SCCR - System Clock Control                                   9-8
  *-----------------------------------------------------------------------
  */
+#ifdef CFG_EP8260_H2
+#define CFG_SCCR        (SCCR_DFBRG00)
+#else
 #define CFG_SCCR        (SCCR_DFBRG01)
+#endif
 
 /*-----------------------------------------------------------------------
  * RCCR - RISC Controller Configuration                         13-7