Merge pull request #185 from facchinm/autoconf_sketch_start_banzai_mainline

Add method to automatically retrieve sketch start

Author: facchinm

VARIANT_COMPLIANCE_CHANGELOG

@@ -1,3 +1,7 @@
+SAMD CORE 1.6.10
+
+* the linker script is use should define __text_start__ symbol at the beginning of .text section
+
 SAMD CORE 1.6.6
 
 * digitalPinToInterrupt #define moved to Arduino.h, variant.h must no longer define it

cores/arduino/Reset.cpp

@@ -24,7 +24,15 @@ extern "C" {
 #endif
 
 #define NVM_MEMORY ((volatile uint16_t *)0x000000)
+
+#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10610)
+
+extern const uint32_t __text_start__;
+#define APP_START ((volatile uint32_t)(&__text_start__) + 4)
+
+#else
 #define APP_START 0x00002004
+#endif
 
 static inline bool nvmReady(void) {
         return NVMCTRL->INTFLAG.reg & NVMCTRL_INTFLAG_READY;
@@ -35,6 +43,13 @@ static void banzai() {
 	// Disable all interrupts
 	__disable_irq();
 
+	// Avoid erasing the application if APP_START is < than the minimum bootloader size
+	// This could happen if without_bootloader linker script was chosen
+	// Minimum bootloader size in SAMD21 family is 512bytes (RM section 22.6.5)
+	if (APP_START < (0x200 + 4)) {
+		goto reset;
+	}
+
 	// Erase application
 	while (!nvmReady())
 		;
@@ -44,6 +59,7 @@ static void banzai() {
 	while (!nvmReady())
 		;
 
+reset:
 	// Reset the device
 	NVIC_SystemReset() ;
 

variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld

@@ -65,6 +65,8 @@ SECTIONS
 {
 	.text :
 	{
+		__text_start__ = .;
+
 		KEEP(*(.isr_vector))
 		*(.text*)
 

variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld

@@ -66,6 +66,8 @@ SECTIONS
 {
 	.text :
 	{
+		__text_start__ = .;
+
 		KEEP(*(.isr_vector))
 		*(.text*)
 

variants/arduino_zero/variant.h

@@ -19,8 +19,8 @@
 #ifndef _VARIANT_ARDUINO_ZERO_
 #define _VARIANT_ARDUINO_ZERO_
 
-// The definitions here needs a SAMD core >=1.6.6
-#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10606
+// The definitions here needs a SAMD core >=1.6.10
+#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10610
 
 /*----------------------------------------------------------------------------
  *        Definitions

variants/mkr1000/linker_scripts/gcc/flash_with_bootloader.ld

@@ -65,6 +65,8 @@ SECTIONS
 {
 	.text :
 	{
+		__text_start__ = .;
+
 		KEEP(*(.isr_vector))
 		*(.text*)
 

variants/mkr1000/linker_scripts/gcc/flash_without_bootloader.ld

@@ -66,6 +66,8 @@ SECTIONS
 {
 	.text :
 	{
+		__text_start__ = .;
+
 		KEEP(*(.isr_vector))
 		*(.text*)
 

variants/mkr1000/variant.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
-// The definitions here needs a SAMD core >=1.6.6
-#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10606
+// The definitions here needs a SAMD core >=1.6.10
+#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10610
 
 #include <WVariant.h>
 

variants/mkrzero/linker_scripts/gcc/flash_with_bootloader.ld

@@ -65,6 +65,8 @@ SECTIONS
 {
 	.text :
 	{
+		__text_start__ = .;
+
 		KEEP(*(.isr_vector))
 		*(.text*)
 

variants/mkrzero/linker_scripts/gcc/flash_without_bootloader.ld

@@ -66,6 +66,8 @@ SECTIONS
 {
 	.text :
 	{
+		__text_start__ = .;
+
 		KEEP(*(.isr_vector))
 		*(.text*)