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

Merge pull request #6221 from DieHertz/bfdev-fix-f411-bootloader-request

Browse source 
Fixed call to checkBootloaderRequest()
This commit is contained in:
Michael Keller 2018-06-27 00:32:48 +12:00 • committed by GitHub
commit e260c37be3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/startup/startup_stm32f411xe.s
View file

@ -71,13 +71,8 @@ defined in linker script */
.weak Reset_Handler .weak Reset_Handler
.type Reset_Handler, %function .type Reset_Handler, %function
Reset_Handler: Reset_Handler:
// Check for bootloader reboot // Defined in C code
ldr r0, =0x2001FFFC // mj666 bl checkForBootLoaderRequest
ldr r1, =0xDEADBEEF // mj666
ldr r2, [r0, #0] // mj666
str r0, [r0, #0] // mj666
cmp r2, r1 // mj666
beq Reboot_Loader // mj666
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0
@ -136,13 +131,6 @@ LoopMarkHeapStack:
LoopForever: LoopForever:
b LoopForever b LoopForever
Reboot_Loader: // mj666
// Reboot to ROM // mj666
ldr r0, =0x1FFF0000 // mj666
ldr sp,[r0, #0] // mj666
ldr r0,[r0, #4] // mj666
bx r0 // mj666
.size Reset_Handler, .-Reset_Handler .size Reset_Handler, .-Reset_Handler
/** /**