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/chavdai40/bootloader_defs.h | 5 ----- keyboards/chavdai40/rev1/rules.mk | 5 ++++- keyboards/chavdai40/rev2/rules.mk | 5 ++++- 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 keyboards/chavdai40/bootloader_defs.h (limited to 'keyboards/chavdai40') diff --git a/keyboards/chavdai40/bootloader_defs.h b/keyboards/chavdai40/bootloader_defs.h deleted file mode 100644 index 6b218f7bd3..0000000000 --- a/keyboards/chavdai40/bootloader_defs.h +++ /dev/null @@ -1,5 +0,0 @@ -/* 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 0x1FFFC400 \ No newline at end of file diff --git a/keyboards/chavdai40/rev1/rules.mk b/keyboards/chavdai40/rev1/rules.mk index 64c6f662af..379bdb6c65 100644 --- a/keyboards/chavdai40/rev1/rules.mk +++ b/keyboards/chavdai40/rev1/rules.mk @@ -1,6 +1,9 @@ # MCU name MCU = STM32F042 +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # change yes to no to disable BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration @@ -15,4 +18,4 @@ NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output \ No newline at end of file +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/chavdai40/rev2/rules.mk b/keyboards/chavdai40/rev2/rules.mk index 64c6f662af..379bdb6c65 100644 --- a/keyboards/chavdai40/rev2/rules.mk +++ b/keyboards/chavdai40/rev2/rules.mk @@ -1,6 +1,9 @@ # MCU name MCU = STM32F042 +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # change yes to no to disable BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration @@ -15,4 +18,4 @@ NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output \ No newline at end of file +AUDIO_ENABLE = no # Audio output -- cgit v1.2.1