darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make bootloader_jump weak for ChibiOS. (#10417)

Browse source
This commit is contained in:
Nick Brassel 2020-09-27 09:41:49 +10:00 committed by James Young
parent 2f2432f0e5
commit 9664723595
No known key found for this signature in database
GPG key ID: 8E1085BF6FCFBD74
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tmk_core/common/chibios/bootloader.c
View file

@ -32,7 +32,7 @@
extern uint32_t __ram0_end__; extern uint32_t __ram0_end__;
void bootloader_jump(void) { __attribute__((weak)) void bootloader_jump(void) {
// For STM32 MCUs with dual-bank flash, and we're incapable of jumping to the bootloader. The first valid flash // For STM32 MCUs with dual-bank flash, and we're incapable of jumping to the bootloader. The first valid flash
// bank is executed unconditionally after a reset, so it doesn't enter DFU unless BOOT0 is high. Instead, we do // bank is executed unconditionally after a reset, so it doesn't enter DFU unless BOOT0 is high. Instead, we do
// it with hardware...in this case, we pull a GPIO high/low depending on the configuration, connects 3.3V to // it with hardware...in this case, we pull a GPIO high/low depending on the configuration, connects 3.3V to
@ -58,7 +58,7 @@ void enter_bootloader_mode_if_requested(void) {} // not needed at all, but if a
extern uint32_t __ram0_end__; extern uint32_t __ram0_end__;
void bootloader_jump(void) { __attribute__((weak)) void bootloader_jump(void) {
*MAGIC_ADDR = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader *MAGIC_ADDR = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader
NVIC_SystemReset(); NVIC_SystemReset();
} }
@ -86,7 +86,7 @@ void enter_bootloader_mode_if_requested(void) {
/* Kiibohd Bootloader (MCHCK and Infinity KB) */ /* Kiibohd Bootloader (MCHCK and Infinity KB) */
# define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000 # define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff"; const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff";
void bootloader_jump(void) { __attribute__((weak)) void bootloader_jump(void) {
__builtin_memcpy((void *)VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic)); __builtin_memcpy((void *)VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
// request reset // request reset
SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk; SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
@ -95,7 +95,7 @@ void bootloader_jump(void) {
# else /* defined(BOOTLOADER_KIIBOHD) */ # else /* defined(BOOTLOADER_KIIBOHD) */
/* Default for Kinetis - expecting an ARM Teensy */ /* Default for Kinetis - expecting an ARM Teensy */
# include "wait.h" # include "wait.h"
void bootloader_jump(void) { __attribute__((weak)) void bootloader_jump(void) {
wait_ms(100); wait_ms(100);
__BKPT(0); __BKPT(0);
} }