Diff: FileSystems/QSPIFileSystem.cpp

Revision:

19:2efb6f5f69a4

Parent:

14:c21497031b1f

Child:

22:1a58a518435c

diff -r e5eb986b2a83 -r 2efb6f5f69a4 FileSystems/QSPIFileSystem.cpp
--- a/FileSystems/QSPIFileSystem.cpp	Wed Jan 07 13:16:17 2015 +0000
+++ b/FileSystems/QSPIFileSystem.cpp	Fri Jan 09 11:42:06 2015 +0100
@@ -215,12 +215,12 @@
         memInfo.tocBlockAddr   = SPIFI_MEM_BASE + (NUM_BLOCKS * ERASE_SIZE) - (memInfo.numTocs * memInfo.tocSizeInBytes);      
         break;
       
-      case SPIFI::Macronix_MX25L6435EM2I:
+      case SPIFI::Macronix_MX25L6435E:
         /* For the Macronix memory the TOC occupies 8192 bytes and that is bigger than 
            one erase block (which is 4096 bytes). It is possible to either keep only
            one TOC or to create a couple to reduce wear on the memory. In this case 
            the multiple TOCs option is used. */
-        strcpy(memInfo.memName, "Macronix_MX25L6435EM2I");
+        strcpy(memInfo.memName, "Macronix_MX25L6435E");
         memInfo.memSize        = obj->memSize;
         memInfo.eraseBlockSize = 4*1024;
         memInfo.numEraseBlocks = memInfo.memSize / memInfo.eraseBlockSize;
@@ -229,6 +229,20 @@
         memInfo.tocBlockAddr   = SPIFI_MEM_BASE + (NUM_BLOCKS * ERASE_SIZE) - (memInfo.numTocs * memInfo.tocSizeInBytes);      
         break;
       
+      case SPIFI::Macronix_MX25L12835F:
+        /* For the Macronix memory the TOC occupies 16384 bytes and that is bigger than 
+           one erase block (which is 4096 bytes). It is possible to either keep only
+           one TOC or to create a couple to reduce wear on the memory. In this case 
+           the multiple TOCs option is used. */
+        strcpy(memInfo.memName, "Macronix_MX25L12835F");
+        memInfo.memSize        = obj->memSize;
+        memInfo.eraseBlockSize = 4*1024;
+        memInfo.numEraseBlocks = memInfo.memSize / memInfo.eraseBlockSize;
+        memInfo.tocSizeInBytes = sizeof(toc_entry_t) * memInfo.numEraseBlocks;
+        memInfo.numTocs        = 4;
+        memInfo.tocBlockAddr   = SPIFI_MEM_BASE + (NUM_BLOCKS * ERASE_SIZE) - (memInfo.numTocs * memInfo.tocSizeInBytes);      
+        break;
+      
       case SPIFI::UnknownDevice:
       default:
         debug("INIT: Memory is unknown and may not work as expected\n");