From 9dcd03b6ca512126231478131796c093d237067f Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 8 Jun 2021 19:48:46 +1000 Subject: Set `BOOTLOADER = stm32-dfu` for all applicable STM32 boards (#12956) * Set bootloader to stm32-dfu for STM32F303 * Set bootloader to stm32-dfu for STM32F0x2 * Set bootloader to stm32-dfu for STM32F4x1 * Set bootloader to stm32duino for sowbug * Delete redundant bootloader_defs headers * Add some missing MCU name comments * Move APM32 dfu-suffix overrides underneath bootloader * Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules --- keyboards/handwired/ck4x4/rules.mk | 3 +++ keyboards/handwired/co60/rev6/config.h | 6 ------ keyboards/handwired/co60/rev6/rules.mk | 3 +++ keyboards/handwired/co60/rev7/config.h | 6 ------ keyboards/handwired/co60/rev7/rules.mk | 3 +++ keyboards/handwired/d48/rules.mk | 3 +++ keyboards/handwired/ddg_56/rules.mk | 5 ++++- keyboards/handwired/floorboard/rules.mk | 3 +++ keyboards/handwired/onekey/blackpill_f401/rules.mk | 4 ++-- keyboards/handwired/onekey/blackpill_f411/rules.mk | 4 ++-- keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk | 6 +++--- keyboards/handwired/onekey/proton_c/rules.mk | 3 +++ keyboards/handwired/onekey/stm32f0_disco/rules.mk | 2 ++ keyboards/handwired/pill60/blackpill_f401/rules.mk | 8 ++------ keyboards/handwired/pill60/blackpill_f411/rules.mk | 8 ++------ keyboards/handwired/riblee_f401/rules.mk | 4 ++-- keyboards/handwired/riblee_f411/rules.mk | 4 ++-- keyboards/handwired/selene/rules.mk | 3 +++ keyboards/handwired/sick_pad/rules.mk | 3 +++ keyboards/handwired/steamvan/rev1/config.h | 6 ------ keyboards/handwired/steamvan/rev1/rules.mk | 3 +++ keyboards/handwired/t111/rules.mk | 1 + keyboards/handwired/wulkan/rules.mk | 3 +++ keyboards/handwired/z150/rules.mk | 1 + 24 files changed, 53 insertions(+), 42 deletions(-) (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk index ebf1648c25..4bad1b8a5d 100644 --- a/keyboards/handwired/ck4x4/rules.mk +++ b/keyboards/handwired/ck4x4/rules.mk @@ -1,6 +1,9 @@ # MCU name MCU = STM32F072 +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # comment out to disable the options. # diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h index 79c64e7353..c142d10f29 100644 --- a/keyboards/handwired/co60/rev6/config.h +++ b/keyboards/handwired/co60/rev6/config.h @@ -25,12 +25,6 @@ #define MANUFACTURER John M Daly #define PRODUCT CO60 rev6 -/* Address for jumping to bootloader on STM32 chips. */ -/* It is chip dependent, the correct number can be looked up here: - * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf - */ -#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/handwired/co60/rev6/rules.mk b/keyboards/handwired/co60/rev6/rules.mk index f4e7ae924d..5c26d9a30d 100644 --- a/keyboards/handwired/co60/rev6/rules.mk +++ b/keyboards/handwired/co60/rev6/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # comment out to disable the options. # diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index 20e62472b7..16fa7cb4c5 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/config.h @@ -26,12 +26,6 @@ along with this program. If not, see . #define MANUFACTURER John M Daly #define PRODUCT CO60 rev7 -/* Address for jumping to bootloader on STM32 chips. */ -/* It is chip dependent, the correct number can be looked up here: - * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf - */ -#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk index 3e15f073ff..25e7a2bf1b 100644 --- a/keyboards/handwired/co60/rev7/rules.mk +++ b/keyboards/handwired/co60/rev7/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Use SPI for RGB underglow: WS2812_DRIVER = spi diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk index 41a6cc5220..60a9f089d1 100644 --- a/keyboards/handwired/d48/rules.mk +++ b/keyboards/handwired/d48/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/handwired/ddg_56/rules.mk b/keyboards/handwired/ddg_56/rules.mk index 8143384302..56c9007128 100644 --- a/keyboards/handwired/ddg_56/rules.mk +++ b/keyboards/handwired/ddg_56/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -15,4 +18,4 @@ NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: h BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = yes # Audio output on port C6 -UNICODE_ENABLE = no # Unicode \ No newline at end of file +UNICODE_ENABLE = no # Unicode diff --git a/keyboards/handwired/floorboard/rules.mk b/keyboards/handwired/floorboard/rules.mk index 131e8fb26d..be14c2e65d 100644 --- a/keyboards/handwired/floorboard/rules.mk +++ b/keyboards/handwired/floorboard/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/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk index 6eb37a581d..9b0a72afb9 100644 --- a/keyboards/handwired/onekey/blackpill_f401/rules.mk +++ b/keyboards/handwired/onekey/blackpill_f401/rules.mk @@ -1,8 +1,8 @@ # MCU name MCU = STM32F401 -# Address of the bootloader in system memory -STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 +# Bootloader selection +BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk index 7cf886431f..3ded2a2587 100644 --- a/keyboards/handwired/onekey/blackpill_f411/rules.mk +++ b/keyboards/handwired/onekey/blackpill_f411/rules.mk @@ -1,8 +1,8 @@ # MCU name MCU = STM32F411 -# Address of the bootloader in system memory -STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 +# Bootloader selection +BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk index ec38577b2b..4d0b1591e2 100755 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk @@ -1,10 +1,10 @@ # MCU name MCU = STM32F411 +# Bootloader selection +BOOTLOADER = tinyuf2 + # Build Options # change yes to no to disable # KEYBOARD_SHARED_EP = yes - -# We want to use the tinyuf2 bootloader... -BOOTLOADER = tinyuf2 \ No newline at end of file diff --git a/keyboards/handwired/onekey/proton_c/rules.mk b/keyboards/handwired/onekey/proton_c/rules.mk index 4e157baeda..7a846816d1 100644 --- a/keyboards/handwired/onekey/proton_c/rules.mk +++ b/keyboards/handwired/onekey/proton_c/rules.mk @@ -1,3 +1,6 @@ # MCU name MCU = STM32F303 BOARD = QMK_PROTON_C + +# Bootloader selection +BOOTLOADER = stm32-dfu diff --git a/keyboards/handwired/onekey/stm32f0_disco/rules.mk b/keyboards/handwired/onekey/stm32f0_disco/rules.mk index d8928e9ec8..6b37928327 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk +++ b/keyboards/handwired/onekey/stm32f0_disco/rules.mk @@ -1,6 +1,8 @@ # MCU name MCU = STM32F072 +# Bootloader selection +BOOTLOADER = stm32-dfu # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk index 8c514309df..9b0a72afb9 100644 --- a/keyboards/handwired/pill60/blackpill_f401/rules.mk +++ b/keyboards/handwired/pill60/blackpill_f401/rules.mk @@ -1,12 +1,8 @@ # MCU name MCU = STM32F401 -# Address of the bootloader in system memory -STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 - -# Options to pass to dfu-util when flashing -DFU_ARGS = -d 0483:DF11 -a 0 -s 0x08000000:leave -DFU_SUFFIX_ARGS = -v 0483 -p DF11 +# Bootloader selection +BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk index 84dd584e85..1243557019 100644 --- a/keyboards/handwired/pill60/blackpill_f411/rules.mk +++ b/keyboards/handwired/pill60/blackpill_f411/rules.mk @@ -1,12 +1,8 @@ # MCU name MCU = STM32F411 -# Address of the bootloader in system memory -STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 - -# Options to pass to dfu-util when flashing -DFU_ARGS = -d 0483:DF11 -a 0 -s 0x08000000:leave -DFU_SUFFIX_ARGS = -v 0483 -p DF11 +# Bootloader selection +BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk index efe2522ee2..0291ca04f3 100644 --- a/keyboards/handwired/riblee_f401/rules.mk +++ b/keyboards/handwired/riblee_f401/rules.mk @@ -1,8 +1,8 @@ # MCU name MCU = STM32F401 -# Address of the bootloader in system memory -STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 +# Bootloader selection +BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk index a44b2b058b..8b029be69d 100644 --- a/keyboards/handwired/riblee_f411/rules.mk +++ b/keyboards/handwired/riblee_f411/rules.mk @@ -1,8 +1,8 @@ # MCU name MCU = STM32F411 -# Address of the bootloader in system memory -STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 +# Bootloader selection +BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable diff --git a/keyboards/handwired/selene/rules.mk b/keyboards/handwired/selene/rules.mk index bfb967f9a5..842675b758 100644 --- a/keyboards/handwired/selene/rules.mk +++ b/keyboards/handwired/selene/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/handwired/sick_pad/rules.mk b/keyboards/handwired/sick_pad/rules.mk index 28578f0824..4fe7d9aff7 100644 --- a/keyboards/handwired/sick_pad/rules.mk +++ b/keyboards/handwired/sick_pad/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/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h index e877484b94..18a6690c25 100644 --- a/keyboards/handwired/steamvan/rev1/config.h +++ b/keyboards/handwired/steamvan/rev1/config.h @@ -26,12 +26,6 @@ along with this program. If not, see . #define MANUFACTURER John M Daly #define PRODUCT SteamVan rev1 -/* Address for jumping to bootloader on STM32 chips. */ -/* It is chip dependent, the correct number can be looked up here: - * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf - */ -#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/handwired/steamvan/rev1/rules.mk b/keyboards/handwired/steamvan/rev1/rules.mk index 30c74d2ece..99edf7c17f 100644 --- a/keyboards/handwired/steamvan/rev1/rules.mk +++ b/keyboards/handwired/steamvan/rev1/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Use SPI for RGB underglow: WS2812_DRIVER = spi diff --git a/keyboards/handwired/t111/rules.mk b/keyboards/handwired/t111/rules.mk index 1c391242ba..558598d74f 100644 --- a/keyboards/handwired/t111/rules.mk +++ b/keyboards/handwired/t111/rules.mk @@ -1,3 +1,4 @@ +# MCU name MCU = STM32F103 # Bootloader selection diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk index 94086e14fe..83f0d7f48f 100644 --- a/keyboards/handwired/wulkan/rules.mk +++ b/keyboards/handwired/wulkan/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # comment out to disable the options. # diff --git a/keyboards/handwired/z150/rules.mk b/keyboards/handwired/z150/rules.mk index d86e9f6e46..b9b242568f 100644 --- a/keyboards/handwired/z150/rules.mk +++ b/keyboards/handwired/z150/rules.mk @@ -1,3 +1,4 @@ +# MCU name MCU = STM32F103 # Bootloader selection -- cgit v1.2.3