Mercurial > flash_v2

changeset 1435:6e485f9ff763

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix cycle time on NAND
author gthomas
date Tue, 09 Dec 2003 02:45:36 +0000
parents 951813e462b6
children 1b465c781382
files packages/hal/powerpc/moab/current/ChangeLog packages/hal/powerpc/moab/current/src/moab.S
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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