Refactor bootloader_jump() implementations (#15450)

* Refactor `bootloader_jump()` implementations * Fix tests? * Rename `atmel-samba` to `md-boot`
2021-12-27 21:10:07 +11:00 · 2021-12-27 21:10:07 +11:00 · 6bc870d899
commit 6bc870d899
parent cffe143ca2
32 changed files with 701 additions and 493 deletions
--- a/keyboards/handwired/onekey/teensy_32/rules.mk
+++ b/keyboards/handwired/onekey/teensy_32/rules.mk
@ -1,5 +1,8 @@
 # MCU name
 MCU = MK20DX256

+# Bootloader selection
+BOOTLOADER = halfkay
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/handwired/onekey/teensy_lc/rules.mk
+++ b/keyboards/handwired/onekey/teensy_lc/rules.mk
@ -2,5 +2,8 @@
 MCU = MKL26Z64
 USE_CHIBIOS_CONTRIB = yes

+# Bootloader selection
+BOOTLOADER = halfkay
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/massdrop/alt/rules.mk
+++ b/keyboards/massdrop/alt/rules.mk
@ -5,6 +5,9 @@ SRC += config_led.c
 ARM_ATSAM = SAMD51J18A
 MCU = cortex-m4

+# Bootloader selection
+BOOTLOADER = md-boot
+
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/massdrop/ctrl/rules.mk
+++ b/keyboards/massdrop/ctrl/rules.mk
@ -5,6 +5,9 @@ SRC += config_led.c
 ARM_ATSAM = SAMD51J18A
 MCU = cortex-m4

+# Bootloader selection
+BOOTLOADER = md-boot
+
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/mechlovin/olly/jf/rules.mk
+++ b/keyboards/mechlovin/olly/jf/rules.mk
@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite

-SRC += matrix.c
+SRC += matrix.c
--- a/keyboards/rocketboard_16/rules.mk
+++ b/keyboards/rocketboard_16/rules.mk
@ -8,7 +8,7 @@ MCU = STM32F103
 MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader
 OPT_DEFS += -DBOOTLOADER_STM32DUINO
 BOARD = STM32_F103_STM32DUINO
-STM32_BOOTLOADER_ADDRESS = 0x80000000
+BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003

--- a/keyboards/tgr/jane/v2ce/rules.mk
+++ b/keyboards/tgr/jane/v2ce/rules.mk
@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable