From 5ee91048e2f774095ceeb2545353a091472a62da Mon Sep 17 00:00:00 2001 From: Conor Patrick Date: Tue, 4 Dec 2018 21:12:21 -0500 Subject: [PATCH] organize memory layout options for debug/release --- targets/stm32l442/Makefile | 11 + targets/stm32l442/application.mk | 10 +- targets/stm32l442/bootloader.mk | 10 +- targets/stm32l442/bootloader/bootloader.h | 7 +- targets/stm32l442/bootloader/main.c | 5 +- .../stm32l442/linker/bootloader_stm32l4xx.ld | 201 +++++++++++++++++ .../bootloader_stm32l4xx_extra.ld} | 0 targets/stm32l442/linker/stm32l4xx.ld | 202 ++++++++++++++++++ .../stm32l4xx_extra.ld} | 0 targets/stm32l442/src/app.h | 4 +- targets/stm32l442/src/memory_layout.h | 13 +- tools/sign_firmware.py | 4 +- 12 files changed, 449 insertions(+), 18 deletions(-) create mode 100644 targets/stm32l442/linker/bootloader_stm32l4xx.ld rename targets/stm32l442/{bootloader_stm32l4xx.ld => linker/bootloader_stm32l4xx_extra.ld} (100%) create mode 100644 targets/stm32l442/linker/stm32l4xx.ld rename targets/stm32l442/{stm32l432xx.ld => linker/stm32l4xx_extra.ld} (100%) diff --git a/targets/stm32l442/Makefile b/targets/stm32l442/Makefile index 0497aa0..4be0573 100644 --- a/targets/stm32l442/Makefile +++ b/targets/stm32l442/Makefile @@ -2,6 +2,17 @@ all: $(MAKE) -f application.mk -j8 solo.hex +debug: + $(MAKE) -f application.mk -j8 solo.hex DEBUG=1 + +debugboot-app: + $(MAKE) -f application.mk -j8 solo.hex DEBUG=1 \ + LDSCRIPT=linker/stm32l4xx_extra.ld EXTRA_DEFINES='-DAPPLICATION_START_PAGE=16' + +debugboot-boot: + $(MAKE) -f bootloader.mk -j8 bootloader.hex DEBUG=1 \ + LDSCRIPT=linker/bootloader_stm32l4xx_extra.ld EXTRA_DEFINES='-DAPPLICATION_START_PAGE=16' + boot: $(MAKE) -f bootloader.mk -j8 bootloader.hex diff --git a/targets/stm32l442/application.mk b/targets/stm32l442/application.mk index 3226826..33f899c 100644 --- a/targets/stm32l442/application.mk +++ b/targets/stm32l442/application.mk @@ -27,7 +27,9 @@ INC += -I../../crypto/tiny-AES-c SEARCH=-L../../tinycbor/lib -LDSCRIPT=stm32l432xx.ld +ifndef LDSCRIPT +LDSCRIPT=linker/stm32l4xx.ld +endif CFLAGS= $(INC) @@ -39,7 +41,11 @@ HW=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb # Solo CHIP=STM32L442xx -DEFINES = -D$(CHIP) -DAES256=1 -DUSE_FULL_LL_DRIVER -DAPP_CONFIG=\"app.h\" +ifndef DEBUG +DEBUG=0 +endif + +DEFINES = -DDEBUG_LEVEL=$(DEBUG) -D$(CHIP) -DAES256=1 -DUSE_FULL_LL_DRIVER -DAPP_CONFIG=\"app.h\" $(EXTRA_DEFINES) # DEFINES += -DTEST_SOLO_STM32 -DTEST -DTEST_FIFO=1 CFLAGS=$(INC) -c $(DEFINES) -Wall -fdata-sections -ffunction-sections $(HW) -g diff --git a/targets/stm32l442/bootloader.mk b/targets/stm32l442/bootloader.mk index 3611940..e8ca05f 100644 --- a/targets/stm32l442/bootloader.mk +++ b/targets/stm32l442/bootloader.mk @@ -25,7 +25,9 @@ INC = -Ibootloader/ -Isrc/ -Isrc/cmsis/ -Ilib/ -Ilib/usbd/ -I../../fido2/ -I../. INC += -I../../tinycbor/src -I../../crypto/sha256 -I../../crypto/micro-ecc INC += -I../../crypto/tiny-AES-c -LDSCRIPT=bootloader_stm32l4xx.ld +ifndef LDSCRIPT +LDSCRIPT=linker/bootloader_stm32l4xx.ld +endif CFLAGS= $(INC) @@ -37,7 +39,11 @@ HW=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb # Solo CHIP=STM32L442xx -DEFINES = -D$(CHIP) -DAES256=1 -DUSE_FULL_LL_DRIVER -DAPP_CONFIG=\"bootloader.h\" +ifndef DEBUG +DEBUG=0 +endif + +DEFINES = -DDEBUG_LEVEL=$(DEBUG) -D$(CHIP) -DAES256=1 -DUSE_FULL_LL_DRIVER -DAPP_CONFIG=\"bootloader.h\" $(EXTRA_DEFINES) # DEFINES += -DTEST_SOLO_STM32 -DTEST -DTEST_FIFO=1 CFLAGS=$(INC) -c $(DEFINES) -Wall -fdata-sections -ffunction-sections $(HW) -g diff --git a/targets/stm32l442/bootloader/bootloader.h b/targets/stm32l442/bootloader/bootloader.h index 412a5a2..4d0c957 100644 --- a/targets/stm32l442/bootloader/bootloader.h +++ b/targets/stm32l442/bootloader/bootloader.h @@ -4,11 +4,12 @@ #define DEBUG_UART USART1 -#define DEBUG_LEVEL 0 +#ifndef DEBUG_LEVEL +#define DEBUG_LEVEL 0 +#endif #define NON_BLOCK_PRINTING 0 - #define BOOT_TO_DFU 0 @@ -19,8 +20,6 @@ #define ENABLE_U2F_EXTENSIONS // #define ENABLE_U2F -#define APPLICATION_JUMP_ADDR (0x08000000 + 32 * 1024) - #define DISABLE_CTAPHID_PING #define DISABLE_CTAPHID_WINK #define DISABLE_CTAPHID_CBOR diff --git a/targets/stm32l442/bootloader/main.c b/targets/stm32l442/bootloader/main.c index 77c797c..eb14eb8 100644 --- a/targets/stm32l442/bootloader/main.c +++ b/targets/stm32l442/bootloader/main.c @@ -31,6 +31,7 @@ #include "log.h" #include "ctap.h" #include "app.h" +#include "memory_layout.h" #include "stm32l4xx_ll_rcc.h" #include "stm32l4xx.h" @@ -42,10 +43,10 @@ void BOOT_boot(void) { typedef void (*pFunction)(void); - uint32_t *bootAddress = (uint32_t *)(APPLICATION_JUMP_ADDR); + uint32_t *bootAddress = (uint32_t *)(APPLICATION_START_ADDR); /* Set new vector table */ - SCB->VTOR = APPLICATION_JUMP_ADDR; + SCB->VTOR = APPLICATION_START_ADDR; /* Read new SP and PC from vector table */ __set_MSP(bootAddress[0]); diff --git a/targets/stm32l442/linker/bootloader_stm32l4xx.ld b/targets/stm32l442/linker/bootloader_stm32l4xx.ld new file mode 100644 index 0000000..8b0aea5 --- /dev/null +++ b/targets/stm32l442/linker/bootloader_stm32l4xx.ld @@ -0,0 +1,201 @@ +/* +***************************************************************************** +** + +** File : LinkerScript.ld +** +** Abstract : Linker script for STM32L432KCUx Device with +** 256KByte FLASH, 64KByte RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** +** Distribution: The file is distributed as is, without any warranty +** of any kind. +** +** (c)Copyright Ac6. +** You may use this file as-is or modify it according to the needs of your +** project. Distribution of this file (unmodified or modified) is not +** permitted. Ac6 permit registered System Workbench for MCU users the +** rights to distribute the assembled, compiled & linked contents of this +** file as part of an application binary file, provided that it is built +** using the System Workbench for MCU toolchain. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x2000c000; /* end of RAM */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x200; /* required amount of heap */ +_Min_Stack_Size = 0x400; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 14K +RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 48K +SRAM2 (rw) : ORIGIN = 0x10000000, LENGTH = 16K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(8); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(8); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(8); + *(.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(8); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(8); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(8); + } >FLASH + + .ARM.extab : + { + . = ALIGN(8); + *(.ARM.extab* .gnu.linkonce.armextab.*) + . = ALIGN(8); + } >FLASH + .ARM : { + . = ALIGN(8); + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + . = ALIGN(8); + } >FLASH + + .preinit_array : + { + . = ALIGN(8); + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + . = ALIGN(8); + } >FLASH + + .init_array : + { + . = ALIGN(8); + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + . = ALIGN(8); + } >FLASH + .fini_array : + { + . = ALIGN(8); + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + . = ALIGN(8); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(8); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + + . = ALIGN(8); + _edata = .; /* define a global symbol at data end */ + } >RAM AT> FLASH + + _sisram2 = LOADADDR(.sram2); + + /* CCM-RAM section + * + * IMPORTANT NOTE! + * If initialized variables will be placed in this section, + * the startup code needs to be modified to copy the init-values. + */ + .sram2 : + { + . = ALIGN(8); + _ssram2 = .; /* create a global symbol at sram2 start */ + *(.sram2) + *(.sram2*) + + . = ALIGN(8); + _esram2 = .; /* create a global symbol at sram2 end */ + } >SRAM2 AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss secion */ + _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 left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } +} diff --git a/targets/stm32l442/bootloader_stm32l4xx.ld b/targets/stm32l442/linker/bootloader_stm32l4xx_extra.ld similarity index 100% rename from targets/stm32l442/bootloader_stm32l4xx.ld rename to targets/stm32l442/linker/bootloader_stm32l4xx_extra.ld diff --git a/targets/stm32l442/linker/stm32l4xx.ld b/targets/stm32l442/linker/stm32l4xx.ld new file mode 100644 index 0000000..e005e05 --- /dev/null +++ b/targets/stm32l442/linker/stm32l4xx.ld @@ -0,0 +1,202 @@ +/* +***************************************************************************** +** + +** File : LinkerScript.ld +** +** Abstract : Linker script for STM32L432KCUx Device with +** 256KByte FLASH, 64KByte RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** +** Distribution: The file is distributed as is, without any warranty +** of any kind. +** +** (c)Copyright Ac6. +** You may use this file as-is or modify it according to the needs of your +** project. Distribution of this file (unmodified or modified) is not +** permitted. Ac6 permit registered System Workbench for MCU users the +** rights to distribute the assembled, compiled & linked contents of this +** file as part of an application binary file, provided that it is built +** using the System Workbench for MCU toolchain. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x2000c000; /* end of RAM */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x200; /* required amount of heap */ +_Min_Stack_Size = 0x400; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +/* First 14 KB is bootloader */ +FLASH (rx) : ORIGIN = 0x08003800, LENGTH = 204K-8 /* Leave out 38 Kb at end for data */ +RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 48K +SRAM2 (rw) : ORIGIN = 0x10000000, LENGTH = 16K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(8); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(8); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(8); + *(.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(8); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(8); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(8); + } >FLASH + + .ARM.extab : + { + . = ALIGN(8); + *(.ARM.extab* .gnu.linkonce.armextab.*) + . = ALIGN(8); + } >FLASH + .ARM : { + . = ALIGN(8); + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + . = ALIGN(8); + } >FLASH + + .preinit_array : + { + . = ALIGN(8); + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + . = ALIGN(8); + } >FLASH + + .init_array : + { + . = ALIGN(8); + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + . = ALIGN(8); + } >FLASH + .fini_array : + { + . = ALIGN(8); + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + . = ALIGN(8); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(8); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + + . = ALIGN(8); + _edata = .; /* define a global symbol at data end */ + } >RAM AT> FLASH + + _sisram2 = LOADADDR(.sram2); + + /* CCM-RAM section + * + * IMPORTANT NOTE! + * If initialized variables will be placed in this section, + * the startup code needs to be modified to copy the init-values. + */ + .sram2 : + { + . = ALIGN(8); + _ssram2 = .; /* create a global symbol at sram2 start */ + *(.sram2) + *(.sram2*) + + . = ALIGN(8); + _esram2 = .; /* create a global symbol at sram2 end */ + } >SRAM2 AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss secion */ + _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 left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } +} diff --git a/targets/stm32l442/stm32l432xx.ld b/targets/stm32l442/linker/stm32l4xx_extra.ld similarity index 100% rename from targets/stm32l442/stm32l432xx.ld rename to targets/stm32l442/linker/stm32l4xx_extra.ld diff --git a/targets/stm32l442/src/app.h b/targets/stm32l442/src/app.h index e52b4a9..5c41d44 100644 --- a/targets/stm32l442/src/app.h +++ b/targets/stm32l442/src/app.h @@ -4,7 +4,9 @@ #define DEBUG_UART USART1 -#define DEBUG_LEVEL 1 +#ifndef DEBUG_LEVEL +#define DEBUG_LEVEL 0 +#endif #define NON_BLOCK_PRINTING 0 diff --git a/targets/stm32l442/src/memory_layout.h b/targets/stm32l442/src/memory_layout.h index 92ecd35..17a0ed7 100644 --- a/targets/stm32l442/src/memory_layout.h +++ b/targets/stm32l442/src/memory_layout.h @@ -20,14 +20,17 @@ #define RK_END_PAGE (PAGES - 14 + RK_NUM_PAGES) // Start of application code -#define APPLICATION_START_PAGE (16) -#define APPLICATION_START_ADDR flash_addr(APPLICATION_START_PAGE) +#ifndef APPLICATION_START_PAGE +#define APPLICATION_START_PAGE (7) +#endif +#define APPLICATION_START_ADDR (0x08000000 + ((APPLICATION_START_PAGE)*PAGE_SIZE)) // End of application code. Leave some extra room for future data storage. -#define APPLICATION_END_PAGE ((PAGES - 19)) // 119 is NOT included in application -#define APPLICATION_END_ADDR (flash_addr(APPLICATION_END_PAGE)-8) // NOT included in application +// NOT included in application +#define APPLICATION_END_PAGE ((PAGES - 19)) +#define APPLICATION_END_ADDR ((0x08000000 + ((APPLICATION_END_PAGE)*PAGE_SIZE))-8) // Bootloader state. -#define AUTH_WORD_ADDR (flash_addr(APPLICATION_END_PAGE)-8) +#define AUTH_WORD_ADDR ((0x08000000 + ((APPLICATION_END_PAGE)*PAGE_SIZE))-8) #endif diff --git a/tools/sign_firmware.py b/tools/sign_firmware.py index ae79c60..4608bf0 100644 --- a/tools/sign_firmware.py +++ b/tools/sign_firmware.py @@ -24,8 +24,8 @@ def get_firmware_object(sk_name, hex_file): # start of firmware and the size of the flash region allocated for it. # TODO put this somewhere else. - START = 0x08008000 - END = START + 1024 * 186 - 8 + START = ih.segments()[0][0] + END = ((0x08000000 + ((128-19)*2024))-8) ih = IntelHex(hex_file) segs = ih.segments()