diff options
| author | Dasky <32983009+daskygit@users.noreply.github.com> | 2022-01-15 01:04:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-15 01:04:58 +0000 |
| commit | 08a42dc72c2e1f6ad42fb33d6a3fd51931d02d01 (patch) | |
| tree | 0a1d70e64c2015ce24ee6f48c822459caf86d855 | |
| parent | 77eae62d62546c00183d05aadc3c9870658f9306 (diff) | |
| download | qmk_firmware-08a42dc72c2e1f6ad42fb33d6a3fd51931d02d01.tar.gz qmk_firmware-08a42dc72c2e1f6ad42fb33d6a3fd51931d02d01.zip | |
Fix broken bootloader builds in develop. (#15880)
| -rw-r--r-- | keyboards/clueboard/60/info.json | 1 | ||||
| -rw-r--r-- | keyboards/clueboard/66/rev4/info.json | 1 | ||||
| -rw-r--r-- | keyboards/clueboard/66_hotswap/gen1/info.json | 1 | ||||
| -rw-r--r-- | keyboards/clueboard/california/info.json | 1 | ||||
| -rw-r--r-- | keyboards/edi/hardlight/mk2/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/ez_maker/directpins/proton_c/info.json | 1 | ||||
| -rw-r--r-- | keyboards/forever65/info.json | 1 | ||||
| -rw-r--r-- | keyboards/mechlovin/mechlovin9/rev1/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/rgbkb/mun/rules.mk | 3 | ||||
| -rw-r--r-- | platforms/chibios/bootloaders/none.c | 4 |
10 files changed, 17 insertions, 1 deletions
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json index 1698d221d3..6e0d90fe1d 100644 --- a/keyboards/clueboard/60/info.json +++ b/keyboards/clueboard/60/info.json @@ -5,6 +5,7 @@ "debounce": 6, "processor": "STM32F303", "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "features": { "audio": true, diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json index f1f1ae4dec..b40abf402f 100644 --- a/keyboards/clueboard/66/rev4/info.json +++ b/keyboards/clueboard/66/rev4/info.json @@ -5,6 +5,7 @@ "debounce": 5, "processor": "STM32F303", "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "features": { "audio": true, diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json index 5e0e5b8aca..cf6288b545 100644 --- a/keyboards/clueboard/66_hotswap/gen1/info.json +++ b/keyboards/clueboard/66_hotswap/gen1/info.json @@ -5,6 +5,7 @@ "debounce": 5, "processor": "STM32F303", "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "features": { "audio": true, diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json index e40b2338cd..24a9399923 100644 --- a/keyboards/clueboard/california/info.json +++ b/keyboards/clueboard/california/info.json @@ -4,6 +4,7 @@ "maintainer": "skullydazed", "processor": "STM32F303", "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", "matrix_pins": { "direct": [ ["A10", "A9"], diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk index 5ffab4a55e..b3ff36943f 100644 --- a/keyboards/edi/hardlight/mk2/rules.mk +++ b/keyboards/edi/hardlight/mk2/rules.mk @@ -2,7 +2,7 @@ MCU = STM32F072 # Bootloader selection -Bootloader = stm32-dfu +BOOTLOADER = stm32-dfu # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF diff --git a/keyboards/ez_maker/directpins/proton_c/info.json b/keyboards/ez_maker/directpins/proton_c/info.json index a284e5c41f..e3d000424a 100644 --- a/keyboards/ez_maker/directpins/proton_c/info.json +++ b/keyboards/ez_maker/directpins/proton_c/info.json @@ -5,6 +5,7 @@ "debounce": 5, "processor": "STM32F303", "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", "features": { "bootmagic": true, "extrakey": true, diff --git a/keyboards/forever65/info.json b/keyboards/forever65/info.json index 6cb2442a08..9f5a3539e3 100644 --- a/keyboards/forever65/info.json +++ b/keyboards/forever65/info.json @@ -3,6 +3,7 @@ "manufacturer": "Nightingale Studios", "maintainer": "zvecr", "processor": "STM32F072", + "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "A4", "B5"], diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk index 1333470e59..927204fc74 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk +++ b/keyboards/mechlovin/mechlovin9/rev1/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # change yes to no to disable # diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk index c7e6594ead..d2ad9cdcc2 100644 --- a/keyboards/rgbkb/mun/rules.mk +++ b/keyboards/rgbkb/mun/rules.mk @@ -1,6 +1,9 @@ # MCU name MCU = STM32F303 +# Bootloader selection +BOOTLOADER = stm32-dfu + # Touch encoder needs SRC += ../common/touch_encoder.c SRC += ../common/common_oled.c diff --git a/platforms/chibios/bootloaders/none.c b/platforms/chibios/bootloaders/none.c index 624fbe242a..8379d35abf 100644 --- a/platforms/chibios/bootloaders/none.c +++ b/platforms/chibios/bootloaders/none.c @@ -16,4 +16,8 @@ #include "bootloader.h" +#pragma message "Unknown bootloader set, you may not be able to enter bootloader using software reset" + __attribute__((weak)) void bootloader_jump(void) {} + +__attribute__((weak)) void enter_bootloader_mode_if_requested(void) {} |