From 83d757f3e1abae2fec08bb0052544ab08b25bd42 Mon Sep 17 00:00:00 2001
From: Ben <57039667+ben-qnimble@users.noreply.github.com>
Date: Tue, 17 Dec 2019 22:10:42 -0700
Subject: [PATCH 1/3] Adding qNimble Quark to supported device family

---
 README.md        | 1 +
 src/Device.cpp   | 8 ++++++++
 src/EfcFlash.cpp | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 72b702fd..2eb1549e 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Supported Device Families
  * SAMS70\*
  * SAMV70\*
  * SAMV71\*
+ * qNimble Quark\*
 
 \* Device families which are not tested for each release and could stop working.
 
diff --git a/src/Device.cpp b/src/Device.cpp
index 0c94ae44..08ce4986 100644
--- a/src/Device.cpp
+++ b/src/Device.cpp
@@ -418,6 +418,14 @@ Device::create()
         _family = FAMILY_SAMV71;
         flashPtr = new EefcFlash(_samba, "ATSAMV71x21", 0x400000, 4096, 512, 1, 128, 0x20401000, 0x20404000, 0x400e0c00, false);
         break;
+	//
+	// qNimble BOSSA-compatible bootloader
+	//
+	case 0x714e3000:
+        _family = FAMILY_SAM7X;
+        flashPtr = new EfcFlash(_samba, "qNimble BOSSAv1", 0x300000, 16384, 256, 2, 32, 0x202000, 0x220000, true);
+
+        break;
     //
     // No CHIPID devices
     //
diff --git a/src/EfcFlash.cpp b/src/EfcFlash.cpp
index 9b212385..f6db9bf6 100644
--- a/src/EfcFlash.cpp
+++ b/src/EfcFlash.cpp
@@ -65,7 +65,7 @@ EfcFlash::EfcFlash(Samba& samba,
       _canBootFlash(canBootFlash)
 {
     assert(planes == 1 || planes == 2);
-    assert(pages <= planes * 1024);
+    assert(pages <= planes * 16384);
     assert(lockRegions <= 32);
 
     eraseAuto(true);

From 3619050cab4ca5bf3ba5f02902116a572e7b7375 Mon Sep 17 00:00:00 2001
From: Ben <57039667+ben-qnimble@users.noreply.github.com>
Date: Wed, 23 Dec 2020 14:09:33 -0500
Subject: [PATCH 2/3] Support full 8MB of flash in single page for qNimble
 Quarto. Name change to Quarto.

---
 README.md        | 2 +-
 src/Device.cpp   | 2 +-
 src/EfcFlash.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2eb1549e..ecabde0e 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Supported Device Families
  * SAMS70\*
  * SAMV70\*
  * SAMV71\*
- * qNimble Quark\*
+ * qNimble Quarto\*
 
 \* Device families which are not tested for each release and could stop working.
 
diff --git a/src/Device.cpp b/src/Device.cpp
index 08ce4986..8e848c45 100644
--- a/src/Device.cpp
+++ b/src/Device.cpp
@@ -423,7 +423,7 @@ Device::create()
 	//
 	case 0x714e3000:
         _family = FAMILY_SAM7X;
-        flashPtr = new EfcFlash(_samba, "qNimble BOSSAv1", 0x300000, 16384, 256, 2, 32, 0x202000, 0x220000, true);
+        flashPtr = new EfcFlash(_samba, "qNimble BOSSAv1", 0x300000, 32768, 256, 1, 32, 0x202000, 0x220000, true);
 
         break;
     //
diff --git a/src/EfcFlash.cpp b/src/EfcFlash.cpp
index f6db9bf6..81b0c217 100644
--- a/src/EfcFlash.cpp
+++ b/src/EfcFlash.cpp
@@ -65,7 +65,7 @@ EfcFlash::EfcFlash(Samba& samba,
       _canBootFlash(canBootFlash)
 {
     assert(planes == 1 || planes == 2);
-    assert(pages <= planes * 16384);
+    assert(pages <= planes * 65536);
     assert(lockRegions <= 32);
 
     eraseAuto(true);

From dee80dfe0e18dae550e42cab072366a573438efe Mon Sep 17 00:00:00 2001
From: Ben <57039667+ben-qnimble@users.noreply.github.com>
Date: Sat, 26 Dec 2020 09:50:25 -0500
Subject: [PATCH 3/3] Detect both 32 and 64 bit windows versions.

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 63b2b017..cea9eeeb 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,12 @@ INSTALLDIR=install
 # Determine OS
 #
 OS:=$(shell uname -s | cut -c -7)
+OS_SHORT:=$(shell uname -s | cut -c -5)
 
 #
 # Windows rules
 #
-ifeq ($(OS),MINGW32)
+ifeq ($(OS_SHORT),MINGW)
 # Use wxWindows development branch to work around font scaling issues on Windows
 WXVERSION=3.1
 EXE=.exe