Fix stuff

platforms/avr/bootloaders/bootloadhid.c

@@ -27,7 +27,9 @@ __attribute__((weak)) void bootloader_jump(void) {
     eeprom_write_byte((uint8_t *)1, 0x00);
 
     // watchdog reset
-    mcu_reset();
+    wdt_enable(WDTO_250MS);
+    for (;;)
+        ;
 }
 
 __attribute__((weak)) void mcu_reset(void) {

platforms/avr/bootloaders/caterina.c

@@ -30,7 +30,12 @@ __attribute__((weak)) void bootloader_jump(void) {
 
     *bootKeyPtr = bootKey;
 
-    mcu_reset();
+    // setup watchdog timeout
+    wdt_enable(WDTO_60MS);
+
+    // wait for watchdog timer to trigger
+    while (1) {
+    }
 }
 
 __attribute__((weak)) void mcu_reset(void) {

platforms/avr/bootloaders/dfu.c

@@ -35,7 +35,10 @@ __attribute__((weak)) void bootloader_jump(void) {
     _delay_ms(5); // 5 seems to work fine
 
     reset_key = BOOTLOADER_RESET_KEY;
-    mcu_reset();
+    // watchdog reset
+    wdt_enable(WDTO_250MS);
+    for (;;)
+        ;
 }
 
 __attribute__((weak)) void mcu_reset(void) {

platforms/chibios/bootloaders/custom.c

@@ -17,6 +17,6 @@
 #include "bootloader.h"
 
 __attribute__((weak)) void bootloader_jump(void) {}
-__attribute__((weak)) void mcu_reset(void) { NVIC_SystemReset(); }
+__attribute__((weak)) void mcu_reset(void) {}
 
 __attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}

platforms/chibios/bootloaders/gd32v_dfu.c

@@ -36,9 +36,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     *DBGMCU_CMD = DBGMCU_CMD_RESET;
 }
 
-__attribute__((weak)) void mcu_reset(void) {
-     *DBGMCU_CMD = DBGMCU_CMD_RESET;
-}
+__attribute__((weak)) void mcu_reset(void) { *DBGMCU_CMD = DBGMCU_CMD_RESET; }
 
 /* Jumping to bootloader is not possible from user code. */
 void enter_bootloader_mode_if_requested(void) {}

platforms/chibios/bootloaders/stm32_dfu.c

@@ -61,9 +61,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     mcu_reset();
 }
 
-__attribute__((weak)) void mcu_reset(void) {
-    NVIC_SystemReset();
-}
+__attribute__((weak)) void mcu_reset(void) { NVIC_SystemReset(); }
 // not needed at all, but if anybody attempts to invoke it....
 void enter_bootloader_mode_if_requested(void) {}
 
@@ -76,13 +74,11 @@ void enter_bootloader_mode_if_requested(void) {}
 
 __attribute__((weak)) void bootloader_jump(void) {
     *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
-    mcu_reset();
-}
-
-__attribute__((weak)) void mcu_reset(void) {
     NVIC_SystemReset();
 }
 
+__attribute__((weak)) void mcu_reset(void) { NVIC_SystemReset(); }
+
 void enter_bootloader_mode_if_requested(void) {
     unsigned long *check = MAGIC_ADDR;
     if (*check == BOOTLOADER_MAGIC) {

platforms/chibios/bootloaders/stm32duino.c

@@ -19,4 +19,4 @@
 #include <ch.h>
 
 __attribute__((weak)) void bootloader_jump(void) { mcu_reset(); }
-__attribute__((weak)) void mcu_reset(void) { NVIC_SystemReset(); }
+__attribute__((weak)) void mcu_reset(void) {}

platforms/chibios/bootloaders/tinyuf2.c

@@ -25,13 +25,11 @@
 extern uint32_t _board_dfu_dbl_tap[];
 #define DBL_TAP_REG _board_dfu_dbl_tap[0]
 
-__attribute__((weak)) void mcu_reset(void) {
-    NVIC_SystemReset();
-}
+__attribute__((weak)) void mcu_reset(void) { NVIC_SystemReset(); }
 
 __attribute__((weak)) void bootloader_jump(void) {
     DBL_TAP_REG = DBL_TAP_MAGIC;
-    mcu_reset();
+    NVIC_SystemReset();
 }
 
 /* not needed, no two-stage reset */