Merge pull request shumatech#6 from 8devices/arduino

Fix crash for SAMD and add support for SAMD21J18A.

Author: cmaglie

src/FlashFactory.cpp

@@ -51,12 +51,13 @@ FlashFactory::create(Samba& samba, uint32_t chipId)
     // SAMD21
     //
     case 0x10010000:
-        flash = new NvmFlash(samba, "ATSAMD21J18A", 0x000000, 4096, 64, 1, 16, 0x804000, 0x20008000, 0x41004000, true);
+	case 0x10010100:
+        flash = new NvmFlash(samba, "ATSAMD21J18A", 0x000000, 4096, 64, 1, 16, 0x20004000, 0x20008000, 0x41004000, true);
         // 0x41004000 == Base address for the NVMCTRL module
         break;
 
     case 0x10010005:
-        flash = new NvmFlash(samba, "ATSAMD21G18A", 0x000000, 4096, 64, 1, 16, 0x804000, 0x20008000, 0x41004000, true);
+        flash = new NvmFlash(samba, "ATSAMD21G18A", 0x000000, 4096, 64, 1, 16, 0x20004000, 0x20008000, 0x41004000, true);
         break;
 
     //

src/Samba.cpp

@@ -143,7 +143,7 @@ Samba::init()
             printf("Unsupported ARM920T architecture\n");
     }
     // Check for supported M0+ processor
-    else if (cid == 0x10010000 || cid == 0x10010005)
+	else if (cid == 0x10010000 || cid == 0x10010100 || cid == 0x10010005)
     {
         return true;
     }
@@ -608,6 +608,7 @@ Samba::reset(void)
     {
     // SAMD21G18 or SAMD21J18
     case 0x10010000:
+	case 0x10010100:
     case 0x10010005:
         // http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0484c/index.html
         writeWord(0xE000ED0C, 0x05FA0004);