# HG changeset patch
# User gthomas
# Date 1070937936 0
# Node ID 6e485f9ff76305ffcd36ded697bb033bc03e8208
# Parent  951813e462b6e3becd183bc158aea9c79d9c2c51
Fix cycle time on NAND

diff --git a/packages/hal/powerpc/moab/current/ChangeLog b/packages/hal/powerpc/moab/current/ChangeLog
--- a/packages/hal/powerpc/moab/current/ChangeLog
+++ b/packages/hal/powerpc/moab/current/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-08  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/moab.S: Fix cycle time on NAND FLASH.
+
 2003-10-15  Gary Thomas  <gary@mlbassoc.com>
 
 	* cdl/hal_powerpc_moab.cdl: Remove [unused] tests so "make tests" works.
diff --git a/packages/hal/powerpc/moab/current/src/moab.S b/packages/hal/powerpc/moab/current/src/moab.S
--- a/packages/hal/powerpc/moab/current/src/moab.S
+++ b/packages/hal/powerpc/moab/current/src/moab.S
@@ -167,7 +167,14 @@ sdram_ok:
         mtdcr   DCR_EBC0_CFGADDR,r3
         mtdcr   DCR_EBC0_CFGDATA,r4
         li      r3,DCR_EBC0_B1AP          // MAIN FLASH at 0xCxxxxxxx, R/W
-        lwi     r4,0x7F8FFE00
+#if CYGHWR_HAL_POWERPC_CPU_SPEED == 250        
+        lwi     r4,0x03840000             // Cycle time = 50ns
+#elif CYGHWR_HAL_POWERPC_CPU_SPEED == 333
+        lwi     r4,0x05840000            
+#else
+        lwi     r4,0x0C840000            
+#error "Unsupported board/CPU speed"        
+#endif
         mtdcr   DCR_EBC0_CFGADDR,r3
         mtdcr   DCR_EBC0_CFGDATA,r4
         li      r3,DCR_EBC0_B1CR