unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / devs / flash / intel / 28fxxx / v2_0 / include / flash_28fxxx.inl

diff --git a/packages/devs/flash/intel/28fxxx/v2_0/include/flash_28fxxx.inl b/packages/devs/flash/intel/28fxxx/v2_0/include/flash_28fxxx.inl
index 95b890484b8eb55070ee3cd76d10744720016ed5..34cc2825c18e851f8daa9fc83ca425da39a91ef9 100644 (file)
--- a/packages/devs/flash/intel/28fxxx/v2_0/include/flash_28fxxx.inl
+++ b/packages/devs/flash/intel/28fxxx/v2_0/include/flash_28fxxx.inl
@@ -325,7 +325,7 @@ int norflash_erase_block(void* block, unsigned int block_size)
         *b_v = FLASH_Block_Erase;
         *b_v = FLASH_Confirm;
 
-        timeout = 50000000;
+        timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT ;
         while(((stat = *b_v) & FLASH_Status_Ready) != FLASH_Status_Ready) {
             if (--timeout == 0) break;
         }
@@ -387,7 +387,7 @@ int norflash_program_buf(void* addr, void* data, int len,
     volatile flash_data_t* data_p = (flash_data_t*) data;
 
     int res = FLASH_ERR_OK;
-    
+
     // Base address of device(s) being programmed. 
     ROM = FLASH_P2V((unsigned long)addr & flash_dev_info->base_mask);
     BA = FLASH_P2V((unsigned long)addr & ~(flash_dev_info->block_size - 1));
@@ -410,7 +410,7 @@ int norflash_program_buf(void* addr, void* data, int len,
 
         wc = (wc + 1) & ~0x1;
 
-        timeout = 50000000;
+        timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
         do {
             *addr_v = FLASH_Write_Buffer_M18;
             if (--timeout == 0) {
@@ -429,7 +429,7 @@ int norflash_program_buf(void* addr, void* data, int len,
 
         // confirm
         *addr_p = FLASH_Confirm;
-        timeout = 50000000;
+        timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
         while(((stat = *addr_p) & FLASH_Status_Ready) != FLASH_Status_Ready) {
             if (--timeout == 0) {
                 res = FLASH_ERR_DRV_TIMEOUT;
@@ -475,7 +475,7 @@ int norflash_program_buf(void* addr, void* data, int len,
             if (wc > len) wc = len;
             len -= wc;
             wc = wc / ((CYGNUM_FLASH_WIDTH/8)*CYGNUM_FLASH_INTERLEAVE);  // Word count
-            timeout = 50000000;
+            timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
             
             *BA = FLASH_Write_Buffer;
             while(((stat = BA[0]) & FLASH_Status_Ready) != FLASH_Status_Ready) {
@@ -493,7 +493,7 @@ int norflash_program_buf(void* addr, void* data, int len,
             *BA = FLASH_Confirm;
             
             *BA = FLASH_Read_Status;
-            timeout = 50000000;
+            timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
             while(((stat = BA[0]) & FLASH_Status_Ready) != FLASH_Status_Ready) {
                 if (--timeout == 0) {
                     res = FLASH_ERR_DRV_TIMEOUT;
@@ -506,9 +506,9 @@ int norflash_program_buf(void* addr, void* data, int len,
 
     while (len > 0) {
         addr_v = FLASH_P2V(addr_p++);
-                       *addr_v = FLASH_Program;
+        *addr_v  = FLASH_Program;
         *addr_v = *data_p;
-        timeout = 50000000;
+        timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
         while(((stat = *addr_v) & FLASH_Status_Ready) != FLASH_Status_Ready) {
             if (--timeout == 0) {
                 res = FLASH_ERR_DRV_TIMEOUT;
@@ -564,7 +564,7 @@ int norflash_lock_block(void* block)
     volatile flash_data_t *ROM;
     int res = FLASH_ERR_OK;
     flash_data_t state;
-    int timeout = 5000000;
+    int timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
     volatile flash_data_t* b_p = (flash_data_t*) block;
     volatile flash_data_t *b_v;
     cyg_bool bootblock;
@@ -588,7 +588,7 @@ int norflash_lock_block(void* block)
     }
 
     CYGHWR_FLASH_WRITE_ENABLE();
-
+    
     while (len > 0) {
         b_v = FLASH_P2V(b_p);
 #ifdef CYGPKG_HAL_ARM_MXC30031ADS
@@ -641,7 +641,7 @@ int norflash_unlock_block(void* block, int block_size, int blocks)
     volatile flash_data_t *ROM;
     int res = FLASH_ERR_OK;
     flash_data_t state;
-    int timeout = 5000000;
+    int timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
     volatile flash_data_t* b_p = (flash_data_t*) block;
     volatile flash_data_t *b_v;
 
@@ -709,7 +709,7 @@ int norflash_unlock_block(void* block, int block_size, int blocks)
     // Clears all lock bits
     ROM[0] = FLASH_Clear_Lock;
     ROM[0] = FLASH_Clear_Lock_Confirm;  // Confirmation
-    timeout = 5000000;
+    timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
     while(((state = ROM[0]) & FLASH_Status_Ready) != FLASH_Status_Ready) {
         if (--timeout == 0) break;
     }
@@ -721,7 +721,7 @@ int norflash_unlock_block(void* block, int block_size, int blocks)
         if (is_locked[i]) {
             *b_v = FLASH_Set_Lock;
             *b_v = FLASH_Set_Lock_Confirm;  // Confirmation
-            timeout = 5000000;
+            timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
             while(((state = ROM[0]) & FLASH_Status_Ready)
                   != FLASH_Status_Ready) {
                 if (--timeout == 0){
@@ -850,7 +850,7 @@ int norflash_unlock_block(void* block, int block_size, int blocks)
     // Clears all lock bits
     ROM[0] = FLASH_Clear_Locks;
     ROM[0] = FLASH_Clear_Locks_Confirm;  // Confirmation
-    timeout = 5000000;
+    timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
     while(((stat = ROM[0]) & FLASH_Status_Ready) != FLASH_Status_Ready) {
         if (--timeout == 0) break;
     }
@@ -862,7 +862,7 @@ int norflash_unlock_block(void* block, int block_size, int blocks)
         if (is_locked[i]) {
             *bpv = FLASH_Set_Lock;
             *bpv = FLASH_Set_Lock_Confirm;  // Confirmation
-            timeout = 5000000;
+            timeout = CYGNUM_DEVS_FLASH_INTEL_28FXXX_TIMEOUT;
             while(((stat = ROM[0]) & FLASH_Status_Ready) != FLASH_Status_Ready) {
                 if (--timeout == 0) break;
             }