djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(swan_r5):bootloader build (UF2_BOOTLOADER=2) does not set the ISR vector table.

Browse Source
This commit is contained in:
Matthew McGowan 2021-09-29 20:40:37 -07:00
parent 1c1eb49b36
commit e54073b95b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/stm/boards/system_stm32l4xx.c
View File

@ -221,10 +221,6 @@ const uint32_t MSIRangeTable[12] = {100000U, 200000U, 400000U, 800000U, 1
*/ */
void SystemInit(void) { void SystemInit(void) {
#if defined(USER_VECT_TAB_ADDRESS)
/* Configure the Vector Table location -------------------------------------*/
SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET;
#endif
/* FPU settings ------------------------------------------------------------*/ /* FPU settings ------------------------------------------------------------*/
#if (__FPU_PRESENT == 1) && (__FPU_USED == 1) #if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
@ -249,6 +245,13 @@ void SystemInit(void) {
/* Disable all interrupts */ /* Disable all interrupts */
RCC->CIER = 0x00000000U; RCC->CIER = 0x00000000U;
#if !(BOARD_VTOR_DEFER) // only set VTOR if the bootloader hasn't already
#if defined(USER_VECT_TAB_ADDRESS)
/* Configure the Vector Table location -------------------------------------*/
SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET;
#endif
#endif
} }
/** /**