Add support for calling bootloader without BOOT pins

Author: ppescher

Diff for: cores/arduino/Reset.cpp

@@ -0,0 +1,80 @@
+/*
+  Copyright (c) 2012 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "stm32_def.h"
+#include "Reset.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RESET_TO_BOOTLOADER_MAGIC_CODE 0xDEADBEEF
+
+uint32_t reset_to_bootloader_magic __attribute__ ((section (".noinit")));
+
+void checkBoot()
+{
+  if (reset_to_bootloader_magic == RESET_TO_BOOTLOADER_MAGIC_CODE) {
+    reset_to_bootloader_magic = 0;
+#if defined(MCU_SERIES_F7)
+    // arm-none-eabi-gcc 4.9.0 does not correctly inline this
+    // MSP function, so we write it out explicitly here.
+    //__set_MSP(*((uint32_t*) 0x1FF00000));
+    __ASM volatile ("movw r3, #0x0000\nmovt r3, #0x1FF0\nldr r3, [r3, #0]\nMSR msp, r3\n" : : : "r3", "sp");
+
+    ((void (*)(void)) *((uint32_t*) 0x1FF00004))();
+#else
+    __HAL_SYSCFG_REMAPMEMORY_SYSTEMFLASH();
+
+    // arm-none-eabi-gcc 4.9.0 does not correctly inline this
+    // MSP function, so we write it out explicitly here.
+    //__set_MSP(*((uint32_t*) 0x00000000));
+    __ASM volatile ("movs r3, #0\nldr r3, [r3, #0]\nMSR msp, r3\n" : : : "r3", "sp");
+
+    ((void (*)(void)) *((uint32_t*) 0x00000004))();
+#endif
+  }
+}
+
+// Activate the bootloader without BOOT* pins.
+void banzai() {
+  reset_to_bootloader_magic = RESET_TO_BOOTLOADER_MAGIC_CODE;
+  NVIC_SystemReset();
+}
+
+static int ticks = -1;
+
+void initiateReset(int _ticks) {
+  ticks = _ticks;
+}
+
+void cancelReset() {
+  ticks = -1;
+}
+
+void tickReset() {
+  if (ticks == -1)
+    return;
+  ticks--;
+  if (ticks == 0)
+    banzai();
+}
+
+#ifdef __cplusplus
+}
+#endif

Diff for: cores/arduino/Reset.h

@@ -0,0 +1,36 @@
+/*
+  Copyright (c) 2012 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef RESET_H
+#define RESET_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void initiateReset(int ms);
+void tickReset();
+void cancelReset();
+
+void checkBoot();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Diff for: cores/arduino/stm32/clock.c

@@ -36,6 +36,7 @@
   ******************************************************************************
   */
 #include "stm32_def.h"
+#include "Reset.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -84,6 +85,7 @@ void SysTick_Handler(void)
   HAL_IncTick();
   HAL_SYSTICK_IRQHandler();
   osSystickHandler();
+  tickReset();
 }
 
 /**

Diff for: cores/arduino/stm32/hw_config.c

@@ -37,6 +37,7 @@
   */
 #include "stm32_def.h"
 #include "hw_config.h"
+#include "Reset.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -49,6 +50,8 @@
   */
 void hw_config_init(void)
 {
+  checkBoot();
+
   //Initialize the HAL
   HAL_Init();
 

Diff for: variants/OPENTRACKER_V3/ldscript.ld

@@ -89,39 +89,40 @@ SECTIONS
   . = ALIGN(8);
   } >FLASH
   .ARM : {
-	. = ALIGN(8);
+  . = ALIGN(8);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-	. = ALIGN(8);
+  . = ALIGN(8);
   } >FLASH
 
   .preinit_array     :
   {
-	. = ALIGN(8);
+  . = ALIGN(8);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-	. = ALIGN(8);
+  . = ALIGN(8);
   } >FLASH
 
   .init_array :
   {
-	. = ALIGN(8);
+  . = ALIGN(8);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-	. = ALIGN(8);
+  . = ALIGN(8);
   } >FLASH
+  
   .fini_array :
   {
-	. = ALIGN(8);
+  . = ALIGN(8);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-	. = ALIGN(8);
+  . = ALIGN(8);
   } >FLASH
 
   /* used by the startup to initialize data */
@@ -141,9 +142,9 @@ SECTIONS
 
 
   /* Uninitialized data section */
-  . = ALIGN(4);
   .bss :
   {
+    . = ALIGN(4);
     /* This is used by the startup in order to initialize the .bss secion */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
@@ -156,6 +157,15 @@ SECTIONS
     __bss_end__ = _ebss;
   } >RAM
 
+  .noinit (NOLOAD) : ALIGN(4)
+  {
+    _noinit = .;
+    *(.noinit)
+    *(.noinit.*) 
+    . = ALIGN(4) ;
+    _end_noinit = .;
+  } > RAM
+
   /* User_heap_stack section, used to check that there is enough RAM left */
   ._user_heap_stack :
   {
@@ -167,8 +177,6 @@ SECTIONS
     . = ALIGN(8);
   } >RAM
 
-  
-
   /* Remove information from the standard libraries */
   /DISCARD/ :
   {