Bootloader self-update feature for STM32F7xx

- bootloader self-update feature for STM32F7xx
- update linker scripts
- update ram firmware address and magic key ram address

Author: jciberlin

Bootloader/Adapters/Inc/flash_adapter.h

@@ -65,9 +65,9 @@
 #elif defined(STM32F7xx)
 #define FLASH_FIRMWARE_ADDRESS      (0x08020000UL)          //!< Flash address where firmware will be written
 #define FLASH_BOOTLOADER_ADDRESS    (0x08000000UL)          //!< Flash address where bootloader will be written
-#define RAM_FIRMWARE_ADDRESS        (0x20000040UL)          //!< RAM address where firmware will be written
+#define RAM_FIRMWARE_ADDRESS        (0x20020000UL)          //!< RAM address where firmware will be written
 #define MAGIC_KEY_ADDRESS_FLASH     (0x08020200UL)          //!< Flash address in internal flash for communication between bootloader and firmware
-#define MAGIC_KEY_ADDRESS_RAM       (0x20000000UL)          //!< Flash address in ram for communication between bootloader and firmware
+#define MAGIC_KEY_ADDRESS_RAM       (0x20070000UL)          //!< Flash address in ram for communication between bootloader and firmware
 #endif
 
 #define MAGIC_KEY_VALUE         (0x28101987A5B5C5D5UL)      //!< Hex value if written in flash bootloader will jump to firmware

Bootloader/Src/binary_update.c

@@ -120,7 +120,7 @@ BinaryUpdate_erase(uint32_t firmware_size) {
             success = FlashAdapter_erase(firmware_size, s_address);
             break;
         case detectedBinary_BOOTLOADER_FLASH:
-            if (detectedBinary_BOOTLOADER_RAM != boot_info.previus_binary) {
+            if (detectedBinary_BOOTLOADER_RAM == boot_info.previus_binary) {
                 //Only allowed to erase if RAM version is running
                 success = FlashAdapter_erase(firmware_size, s_address);
             }

Linker/STM32F7xx.ld

@@ -28,17 +28,18 @@
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1) + LENGTH(RAM2);	/* end of "RAM" Ram type memory */
 
 _Min_Heap_Size = 0x200 ;	/* required amount of heap  */
 _Min_Stack_Size = 0x400 ;	/* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-  BL_FLAG_RAM (xrw): ORIGIN = 0x20000000,	LENGTH = 64 /* Bootloader flag in RAM */
-  RAM    (xrw)     : ORIGIN = 0x20000040,	LENGTH = 512K - 64
-  FLASH  (rx)      : ORIGIN = 0x08000000,	LENGTH = 128K
+  RAM1    (xrw)    : ORIGIN = 0x20000000,	LENGTH = 128K
+  RAM2    (xrw)    : ORIGIN = 0x20020000,   LENGTH = 512K - 128K - 64K
+  BL_FLAG_RAM (xrw): ORIGIN = 0x20070000,	LENGTH = 64 /* Bootloader flag in RAM */
+  FLASH  (rx)      : ORIGIN = 0x08000000,   LENGTH = 128K
 }
 
 /* Sections */
@@ -124,6 +125,11 @@ SECTIONS
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
+  .restart_info : ALIGN(4)
+  {
+    KEEP(*(.restart_info))
+  } >RAM1 AT> FLASH
+
   /* Initialized data sections into "RAM" Ram type memory */
   .data :
   {
@@ -137,7 +143,7 @@ SECTIONS
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
 
-  } >RAM AT> FLASH
+  } >RAM1 AT> FLASH
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -153,7 +159,7 @@ SECTIONS
     . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
-  } >RAM
+  } >RAM1
 
   /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
   ._user_heap_stack :
@@ -164,7 +170,7 @@ SECTIONS
     . = . + _Min_Heap_Size;
     . = . + _Min_Stack_Size;
     . = ALIGN(8);
-  } >RAM
+  } >RAM1
 
   /* Remove information from the compiler libraries */
   /DISCARD/ :

Linker/STM32F7xx_RAM.ld

@@ -28,32 +28,32 @@
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1) + LENGTH(RAM2);     /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x200 ;	/* required amount of heap  */
-_Min_Stack_Size = 0x400 ;	/* required amount of stack */
+_Min_Heap_Size = 0x200;	    /* required amount of heap  */
+_Min_Stack_Size = 0x400;    /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-  BL_FLAG_RAM (xrw): ORIGIN = 0x20000000,	LENGTH = 64 /* Bootloader flag in RAM */
-  RAM    (xrw)     : ORIGIN = 0x20000040,	LENGTH = 512K - 64
-  SIGNATURE (rx)   : ORIGIN = 0x07FFFFC0,	LENGTH = 64 /* Never written to the FLASH, it is for binary signature. */
+  RAM1    (xrw)    : ORIGIN = 0x20000000,	LENGTH = 128K
+  RAM2    (xrw)    : ORIGIN = 0x20020000,   LENGTH = 512K - 128K - 64K
+  BL_FLAG_RAM (xrw): ORIGIN = 0x20070000,	LENGTH = 64 /* Bootloader flag in RAM */
   FLASH  (rx)      : ORIGIN = 0x08000000,	LENGTH = 128K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "RAM" Rom type memory */
+  /* The startup code into "RAM" Ram type memory */
   .isr_vector :
   {
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-  } >RAM
+  } >RAM2
 
-  /* The program code and other data into "RAM" Rom type memory */
+  /* The program code and other data into "RAM" Ram type memory */
   .text :
   {
     . = ALIGN(4);
@@ -62,36 +62,38 @@ SECTIONS
     *(.glue_7)         /* glue arm to thumb code */
     *(.glue_7t)        /* glue thumb to arm code */
     *(.eh_frame)
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
     KEEP (*(.init))
     KEEP (*(.fini))
 
     . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >RAM
+  } >RAM2
 
-  /* Constant data into "RAM" Rom type memory */
+  /* Constant data into "RAM" Ram type memory */
   .rodata :
   {
     . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     . = ALIGN(4);
-  } >RAM
+  } >RAM2
 
   .ARM.extab   : {
     . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
     . = ALIGN(4);
-  } >RAM
+  } >RAM2
 
   .ARM : {
     . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
     . = ALIGN(4);
-  } >RAM
+  } >RAM2
 
   .preinit_array     :
   {
@@ -100,7 +102,7 @@ SECTIONS
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
     . = ALIGN(4);
-  } >RAM
+  } >RAM2
 
   .init_array :
   {
@@ -110,7 +112,7 @@ SECTIONS
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
     . = ALIGN(4);
-  } >RAM
+  } >RAM2
 
   .fini_array :
   {
@@ -120,30 +122,28 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
     . = ALIGN(4);
-  } >RAM
-  
-    .restart_info : ALIGN(4)
-  {
-    KEEP(*(.restart_info))
-  } >RAM AT> RAM
+  } >RAM2
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
+  .restart_info : ALIGN(4)
+  {
+    KEEP(*(.restart_info))
+  } >RAM1 AT> RAM2
+
   /* Initialized data sections into "RAM" Ram type memory */
   .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
-    *(.RamFunc)        /* .RamFunc sections */
-    *(.RamFunc*)       /* .RamFunc* sections */
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
 
-  } >RAM AT> RAM
+  } >RAM1 AT> RAM2
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -159,7 +159,7 @@ SECTIONS
     . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
-  } >RAM
+  } >RAM1 AT> RAM2
 
   /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
   ._user_heap_stack :
@@ -170,7 +170,7 @@ SECTIONS
     . = . + _Min_Heap_Size;
     . = . + _Min_Stack_Size;
     . = ALIGN(8);
-  } >RAM
+  } >RAM1 AT> RAM2
 
   /* Remove information from the compiler libraries */
   /DISCARD/ :