Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00
Code Issues Wiki Activity

Change position of checkForBootloaderRequest (F745 working)

Browse source
This commit is contained in:
jflyper 2018-12-04 10:09:11 +09:00
parent 6bacdc71ff
commit a539997ffb
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/drivers/system_stm32f7xx.c
View file

@ -154,6 +154,8 @@ bool isMPUSoftReset(void)
void systemInit(void) void systemInit(void)
{ {
checkForBootLoaderRequest();
// Mark ITCM-RAM as read-only // Mark ITCM-RAM as read-only
LL_MPU_ConfigRegion(LL_MPU_REGION_NUMBER0, 0, RAMITCM_BASE, LL_MPU_REGION_SIZE_16KB | LL_MPU_REGION_PRIV_RO_URO); LL_MPU_ConfigRegion(LL_MPU_REGION_NUMBER0, 0, RAMITCM_BASE, LL_MPU_REGION_SIZE_16KB | LL_MPU_REGION_PRIV_RO_URO);
LL_MPU_Enable(LL_MPU_CTRL_PRIVILEGED_DEFAULT); LL_MPU_Enable(LL_MPU_CTRL_PRIVILEGED_DEFAULT);
@ -198,11 +200,16 @@ void checkForBootLoaderRequest(void)
} }
void (*SysMemBootJump)(void); void (*SysMemBootJump)(void);
__SYSCFG_CLK_ENABLE(); __SYSCFG_CLK_ENABLE();
SYSCFG->MEMRMP |= SYSCFG_MEM_BOOT_ADD0 ; SYSCFG->MEMRMP |= SYSCFG_MEM_BOOT_ADD0 ;
uint32_t p = (*((uint32_t *) 0x1ff00000)); uint32_t p = (*((uint32_t *) 0x1ff00000));
__set_MSP(p); //Set the main stack pointer to its defualt values
__set_MSP(p); //Set the main stack pointer to its default values
SysMemBootJump = (void (*)(void)) (*((uint32_t *) 0x1ff00004)); // Point the PC to the System Memory reset vector (+4) SysMemBootJump = (void (*)(void)) (*((uint32_t *) 0x1ff00004)); // Point the PC to the System Memory reset vector (+4)
SysMemBootJump(); SysMemBootJump();
while (1); while (1);
} }

1
src/main/startup/startup_stm32f722xx.s
View file

@ -84,7 +84,6 @@ Reset_Handler:
ldr sp, =_estack /* set stack pointer */ ldr sp, =_estack /* set stack pointer */
bl persistentObjectInit bl persistentObjectInit
bl checkForBootLoaderRequest
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0

1
src/main/startup/startup_stm32f745xx.s
View file

@ -84,7 +84,6 @@ Reset_Handler:
ldr sp, =_estack /* set stack pointer */ ldr sp, =_estack /* set stack pointer */
bl persistentObjectInit bl persistentObjectInit
bl checkForBootLoaderRequest
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0

1
src/main/startup/startup_stm32f746xx.s
View file

@ -84,7 +84,6 @@ Reset_Handler:
ldr sp, =_estack /* set stack pointer */ ldr sp, =_estack /* set stack pointer */
bl persistentObjectInit bl persistentObjectInit
bl checkForBootLoaderRequest
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0

1
src/main/startup/startup_stm32f765xx.s
View file

@ -84,7 +84,6 @@ Reset_Handler:
ldr sp, =_estack /* set stack pointer */ ldr sp, =_estack /* set stack pointer */
bl persistentObjectInit bl persistentObjectInit
bl checkForBootLoaderRequest
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0