Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix bootloader_jump for certain CTRL boards (#16026)

Browse source
This commit is contained in:
Ryan 2022-01-25 09:28:13 +11:00 committed by GitHub
parent 5249a606f1
commit c71c0fba90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platforms/arm_atsam/bootloaders/md_boot.c
View file

@ -18,15 +18,14 @@
#include "samd51j18a.h" #include "samd51j18a.h"
#ifdef KEYBOARD_massdrop_ctrl
// WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support // WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
extern uint32_t _eram; extern uint32_t _eram;
#define BOOTLOADER_MAGIC 0x3B9ACA00 #define BOOTLOADER_MAGIC 0x3B9ACA00
#define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4) #define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
// CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method. // CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
void bootloader_jump(void) { void bootloader_jump(void) {
#ifdef KEYBOARD_massdrop_ctrl
uint8_t ver_ram_method[] = "v2.18Jun 22 2018 17:28:08"; // The version to match (NULL terminated by compiler) uint8_t ver_ram_method[] = "v2.18Jun 22 2018 17:28:08"; // The version to match (NULL terminated by compiler)
uint8_t *ver_check = ver_ram_method; // Pointer to version match string for traversal uint8_t *ver_check = ver_ram_method; // Pointer to version match string for traversal
uint8_t *ver_rom = (uint8_t *)0x21A0; // Pointer to address in ROM where this specific bootloader version would exist uint8_t *ver_rom = (uint8_t *)0x21A0; // Pointer to address in ROM where this specific bootloader version would exist
@ -39,16 +38,12 @@ void bootloader_jump(void) {
if (!*ver_check) { // If check version pointer is NULL, all characters have matched if (!*ver_check) { // If check version pointer is NULL, all characters have matched
*MAGIC_ADDR = BOOTLOADER_MAGIC; // Set magic number into RAM *MAGIC_ADDR = BOOTLOADER_MAGIC; // Set magic number into RAM
NVIC_SystemReset(); // Perform system reset NVIC_SystemReset(); // Perform system reset
while (1) while (1)
; // Won't get here ; // Won't get here
} }
} #endif
#else
// Set watchdog timer to reset. Directs the bootloader to stay in programming mode. // Set watchdog timer to reset. Directs the bootloader to stay in programming mode.
void bootloader_jump(void) {
WDT->CTRLA.bit.ENABLE = 0; WDT->CTRLA.bit.ENABLE = 0;
while (WDT->SYNCBUSY.bit.ENABLE) while (WDT->SYNCBUSY.bit.ENABLE)
@ -65,8 +60,6 @@ void bootloader_jump(void) {
; ;
while (!WDT->CTRLA.bit.ENABLE) while (!WDT->CTRLA.bit.ENABLE)
; ;
while (1) while (1)
; // Wait on timeout ; // Wait on timeout
} }
#endif