Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/bootloader updater #397

Merged
merged 12 commits into from
Nov 21, 2022
Merged
22 changes: 20 additions & 2 deletions engine/HAL/STM32L0/luos_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
/*******************************************************************************
* Variables
******************************************************************************/
#define RSVD_SECTION ".rsvd.data,\"aw\",%nobits//"
#define _RSVD __attribute__((used, section(RSVD_SECTION)))
// timestamp variable
static ll_timestamp_t ll_timestamp;
/*******************************************************************************
Expand Down Expand Up @@ -77,7 +79,23 @@ static void LuosHAL_SystickInit(void)
******************************************************************************/
static void LuosHAL_VectorTableRemap(void)
{
SCB->VTOR = LUOS_VECT_TAB;
/* Copy the vector table from the Flash (mapped at the base of the application
load address 0x0800C800) to the base address of the SRAM at 0x20000000. */
// check if we are at the beginning of flash
if (LUOS_VECT_TAB > FLASH_BASE)
{
static volatile _RSVD uint32_t VectorTable[48];

for (uint32_t i = 0; i < 48; i++)
{
VectorTable[i] = *(__IO uint32_t *)(LUOS_VECT_TAB + (i << 2));
}

/* Enable the SYSCFG peripheral clock*/
__HAL_RCC_SYSCFG_CLK_ENABLE();
/* Remap SRAM at 0x00000000 */
__HAL_SYSCFG_REMAPMEMORY_SRAM();
}
}
/******************************************************************************
* @brief Luos HAL general systick tick at 1ms
Expand Down Expand Up @@ -307,7 +325,7 @@ void LuosHAL_EraseMemory(uint32_t address, uint16_t size)

/******************************************************************************
* @brief Programm flash memory
* @param address : Start address
* @param address : Start address
* @param size :: Data size
* @param data : Pointer to data
* @return
Expand Down
10 changes: 10 additions & 0 deletions engine/bootloader/bootloader_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ bool load_flag = false;
uint16_t source_id = 0; // used to save source_id, ie gate_id
uint32_t tickstart = 0;

#ifndef BOOTLOADER_UPDATER
// Create a variable of the size of mode flash value allowing to init the shared flash section
const uint8_t __attribute__((used)) __attribute__((section(".boot_flags"))) sharedSection = BOOT_MODE;
#endif

/*******************************************************************************
* Function
Expand Down Expand Up @@ -88,7 +90,11 @@ void LuosBootloader_JumpToBootloader(void)
void LuosBootloader_Init(void)
{
revision_t version = {.major = 2, .minor = 0, .build = 0};
#ifdef BOOTLOADER_UPDATER
Luos_CreateService(0, VOID_TYPE, "boot_updater", version);
#else
Luos_CreateService(0, VOID_TYPE, "boot_service", version);
#endif

// set ID node saved in flash
LuosBootloader_SetNodeID();
Expand Down Expand Up @@ -161,7 +167,11 @@ void LuosBootloader_SetNodeID(void)
******************************************************************************/
uint8_t LuosBootloader_IsEnoughSpace(uint32_t binary_size)
{
#ifdef BOOTLOADER_UPDATER
uint32_t free_space = BOOT_START_ADDRESS - APP_START_ADDRESS - 1;
#else
uint32_t free_space = APP_END_ADDRESS - APP_START_ADDRESS;
#endif
if (free_space > binary_size)
{
return SUCCEED;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
/**
******************************************************************************
* @file LinkerScript.ld
* @author Auto-generated by STM32CubeIDE
* @brief Linker script for STM32F072RBTx Device from STM32F0 series
* 128Kbytes FLASH
* 16Kbytes RAM
*
* Set heap size, stack size and stack location according
* to application requirements.
*
* Set memory bank area and size if external memory is used
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
* the "License"; You may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
* opensource.org/licenses/BSD-3-Clause
*
******************************************************************************
*/

/* Entry Point */
ENTRY(Reset_Handler)

/* Highest address of the user mode stack */
_estack = ORIGIN(RAM) + LENGTH(RAM); /* 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
{
RAM_RSVD (xrw) : ORIGIN = 0x20000000, LENGTH = 1K
RAM (xrw) : ORIGIN = 0x20000400, LENGTH = 15K
FLASH (rw) : ORIGIN = 0x800C800, LENGTH = 48K
SHRD_MEM (rx) : ORIGIN = 0x800C000, LENGTH = 2K
}

/* Sections */
SECTIONS
{
/* placing my boot flags section at given address: */
.boot_flags :
{
KEEP(*(.boot_flags)) /* keep my variable even if not referenced */
} > SHRD_MEM

/* The startup code into "FLASH" Rom type memory */
.isr_vector :
{
. = ALIGN(4);
KEEP(*(.isr_vector)) /* Startup code */
. = ALIGN(4);
} >FLASH

/* The program code and other data into "FLASH" Rom type memory */
.text :
{
. = ALIGN(4);
*(.text) /* .text sections (code) */
*(.text*) /* .text* sections (code) */
*(.glue_7) /* glue arm to thumb code */
*(.glue_7t) /* glue thumb to arm code */
*(.eh_frame)

KEEP (*(.init))
KEEP (*(.fini))

. = ALIGN(4);
_etext = .; /* define a global symbols at end of code */
} >FLASH

/* Constant data into "FLASH" Rom type memory */
.rodata :
{
. = ALIGN(4);
*(.rodata) /* .rodata sections (constants, strings, etc.) */
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */
. = ALIGN(4);
} >FLASH

.ARM.extab : {
. = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
} >FLASH

.ARM : {
. = ALIGN(4);
__exidx_start = .;
*(.ARM.exidx*)
__exidx_end = .;
. = ALIGN(4);
} >FLASH

.preinit_array :
{
. = ALIGN(4);
PROVIDE_HIDDEN (__preinit_array_start = .);
KEEP (*(.preinit_array*))
PROVIDE_HIDDEN (__preinit_array_end = .);
. = ALIGN(4);
} >FLASH

.init_array :
{
. = ALIGN(4);
PROVIDE_HIDDEN (__init_array_start = .);
KEEP (*(SORT(.init_array.*)))
KEEP (*(.init_array*))
PROVIDE_HIDDEN (__init_array_end = .);
. = ALIGN(4);
} >FLASH

.fini_array :
{
. = ALIGN(4);
PROVIDE_HIDDEN (__fini_array_start = .);
KEEP (*(SORT(.fini_array.*)))
KEEP (*(.fini_array*))
PROVIDE_HIDDEN (__fini_array_end = .);
. = ALIGN(4);
} >FLASH

/* Used by the startup to initialize data */
_sidata = LOADADDR(.data);

/* 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 */

. = ALIGN(4);
_edata = .; /* define a global symbol at data end */

} >RAM AT> FLASH

/* Uninitialized data section into "RAM" Ram type memory */
. = ALIGN(4);
.bss :
{
/* This is used by the startup in order to initialize the .bss section */
_sbss = .; /* define a global symbol at bss start */
__bss_start__ = _sbss;
*(.bss)
*(.bss*)
*(COMMON)

. = ALIGN(4);
_ebss = .; /* define a global symbol at bss end */
__bss_end__ = _ebss;
} >RAM

/* User_heap_stack section, used to check that there is enough "RAM" Ram type memory left */
._user_heap_stack :
{
. = ALIGN(8);
PROVIDE ( end = . );
PROVIDE ( _end = . );
. = . + _Min_Heap_Size;
. = . + _Min_Stack_Size;
. = ALIGN(8);
} >RAM

.boot_data :
{
*(.rsvd.data)
*(.rsvd.data*)
} > RAM_RSVD

/* Remove information from the compiler libraries */
/DISCARD/ :
{
libc.a ( * )
libm.a ( * )
libgcc.a ( * )
}

.ARM.attributes 0 : { *(.ARM.attributes) }
}
Loading