rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3444 from jflyper/bfdev-fix-issue-3431 

Fix #3431
This commit is contained in:
borisbstyle 2017-07-05 14:17:43 +02:00 committed by GitHub
parent 2cac202447 a877a132b9
commit 4b01b9d4d9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/fc/fc_init.c
View File

@ -269,11 +269,11 @@ void init(void)
#if defined(STM32F4) && !defined(DISABLE_OVERCLOCK) #if defined(STM32F4) && !defined(DISABLE_OVERCLOCK)
// If F4 Overclocking is set and System core clock is not correct a reset is forced // If F4 Overclocking is set and System core clock is not correct a reset is forced
if (systemConfig()->cpu_overclock && SystemCoreClock != 240000000) { if (systemConfig()->cpu_overclock && SystemCoreClock != 240000000) {
*((uint32_t *)0x2001FFFC) = 0xDEADBABE; // 128KB SRAM STM32F4XX *((uint32_t *)0x2001FFF8) = 0xDEADBABE; // 128KB SRAM STM32F4XX
__disable_irq(); __disable_irq();
NVIC_SystemReset(); NVIC_SystemReset();
} else if (!systemConfig()->cpu_overclock && SystemCoreClock == 240000000) { } else if (!systemConfig()->cpu_overclock && SystemCoreClock == 240000000) {
*((uint32_t *)0x2001FFFC) = 0x0; // 128KB SRAM STM32F4XX *((uint32_t *)0x2001FFF8) = 0x0; // 128KB SRAM STM32F4XX
__disable_irq(); __disable_irq();
NVIC_SystemReset(); NVIC_SystemReset();
} }

16
src/main/startup/startup_stm32f40xx.s
View File

@ -79,14 +79,6 @@ Reset_Handler:
str r1, [r0, #0x30] str r1, [r0, #0x30]
dsb dsb
// Check for overclocking request
ldr r0, =0x2001FFFC // Faduf
ldr r1, =0xDEADBABE // Faduf
ldr r2, [r0, #0] // Faduf
str r0, [r0, #0] // Faduf
cmp r2, r1 // Faduf
beq Boot_OC // Faduf
// Check for bootloader reboot // Check for bootloader reboot
ldr r0, =0x2001FFFC // mj666 ldr r0, =0x2001FFFC // mj666
ldr r1, =0xDEADBEEF // mj666 ldr r1, =0xDEADBEEF // mj666
@ -95,6 +87,14 @@ Reset_Handler:
cmp r2, r1 // mj666 cmp r2, r1 // mj666
beq Reboot_Loader // mj666 beq Reboot_Loader // mj666
// Check for overclocking request
ldr r0, =0x2001FFF8 // Faduf
ldr r1, =0xDEADBABE // Faduf
ldr r2, [r0, #0] // Faduf
str r0, [r0, #0] // Faduf
cmp r2, r1 // Faduf
beq Boot_OC // Faduf
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0
b LoopCopyDataInit b LoopCopyDataInit