Diff: Memory/SPIFI.cpp

Revision:

19:2efb6f5f69a4

Parent:

9:a33326afd686

Child:

22:1a58a518435c

--- a/Memory/SPIFI.cpp	Wed Jan 07 13:16:17 2015 +0000
+++ b/Memory/SPIFI.cpp	Fri Jan 09 11:42:06 2015 +0100
@@ -163,13 +163,21 @@
     } 
     else if ((_romData->mfger == 0xc2) && (_romData->devType == 0x20) && (_romData->devID == 0x17) && (_romData->memSize > 0x100000))
     {
-      _device = Macronix_MX25L6435EM2I;
+      _device = Macronix_MX25L6435E;
+      _memorySize = _romData->memSize;
+      _eraseBlockSize = 4*1024;
+    } 
+    else if ((_romData->mfger == 0xc2) && (_romData->devType == 0x20) && (_romData->devID == 0x18) && (_romData->memSize > 0x100000))
+    {
+      _device = Macronix_MX25L12835F;
       _memorySize = _romData->memSize;
       _eraseBlockSize = 4*1024;
     } 
     else 
     {
       debug("SPIFI::init(): Memory is unknown and may not work as expected\n");
+      debug("ID: mfgr 0x%02x, devType 0x%02x, devID 0x%02x, memSize 0x%x\n", 
+            _romData->mfger, _romData->devType, _romData->devID, _romData->memSize);
       
       // Asuming it has 64Kb erase blocks (i.e. same setup as the Spansion S25FL032
       _device = UnknownDevice;