diff options
| author | Ryan <fauxpark@gmail.com> | 2021-06-08 19:48:46 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 19:48:46 +1000 |
| commit | 9dcd03b6ca512126231478131796c093d237067f (patch) | |
| tree | f986f6778e3405f13246de79119275e34e64c8d5 /keyboards/sowbug/ansi_tkl | |
| parent | e0acd3e53dbefe31cec5cc9eef048fd0649d1d1d (diff) | |
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
Diffstat (limited to 'keyboards/sowbug/ansi_tkl')
| -rw-r--r-- | keyboards/sowbug/ansi_tkl/bootloader_defs.h | 10 | ||||
| -rw-r--r-- | keyboards/sowbug/ansi_tkl/rules.mk | 39 |
2 files changed, 16 insertions, 33 deletions
diff --git a/keyboards/sowbug/ansi_tkl/bootloader_defs.h b/keyboards/sowbug/ansi_tkl/bootloader_defs.h deleted file mode 100644 index 6b8fa9f727..0000000000 --- a/keyboards/sowbug/ansi_tkl/bootloader_defs.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Address for jumping to bootloader on STM32 chips. */ -/* It is chip dependent, the correct number can be looked up here (page 175): - * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf - * This also requires a patch to chibios: - * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch - */ - -// STM32F103* does NOT have an USB bootloader in ROM (only serial), -// so setting anything here does not make much sense -#define STM32_BOOTLOADER_ADDRESS 0x80000000 diff --git a/keyboards/sowbug/ansi_tkl/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk index 0439491245..7dc7c6f6db 100644 --- a/keyboards/sowbug/ansi_tkl/rules.mk +++ b/keyboards/sowbug/ansi_tkl/rules.mk @@ -1,34 +1,27 @@ # MCU name MCU = STM32F103 -# GENERIC STM32F103C8T6 board - stm32duino bootloader -OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000 -MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader -BOARD = STM32_F103_STM32DUINO - -DFU_ARGS = -d 1eaf:0003 -a2 -R -DFU_SUFFIX_ARGS = -v 1eaf -p 0003 +# Bootloader selection +BOOTLOADER = stm32duino # Build Options -# comment out to disable the options. +# change yes to no to disable # -BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no -COMMAND_ENABLE = no # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -AUDIO_ENABLE = no +BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # 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 RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -# Want backlighting and RGB Matrix patterns? See the note in the readme, -# apply the patches, and then uncomment the lines below as well as the one in -# config.h. -# -# BACKLIGHT_ENABLE = yes -# BACKLIGHT_DRIVER = rgb_matrix - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |