aboutsummaryrefslogtreecommitdiff
path: root/keyboards/sowbug
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2021-06-08 19:48:46 +1000
committerGitHub <noreply@github.com>2021-06-08 19:48:46 +1000
commit9dcd03b6ca512126231478131796c093d237067f (patch)
treef986f6778e3405f13246de79119275e34e64c8d5 /keyboards/sowbug
parente0acd3e53dbefe31cec5cc9eef048fd0649d1d1d (diff)
downloadqmk_firmware-9dcd03b6ca512126231478131796c093d237067f.tar.gz
qmk_firmware-9dcd03b6ca512126231478131796c093d237067f.zip
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')
-rw-r--r--keyboards/sowbug/68keys/bootloader_defs.h10
-rw-r--r--keyboards/sowbug/68keys/rules.mk39
-rw-r--r--keyboards/sowbug/ansi_tkl/bootloader_defs.h10
-rw-r--r--keyboards/sowbug/ansi_tkl/rules.mk39
4 files changed, 32 insertions, 66 deletions
diff --git a/keyboards/sowbug/68keys/bootloader_defs.h b/keyboards/sowbug/68keys/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/sowbug/68keys/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/sowbug/68keys/rules.mk b/keyboards/sowbug/68keys/rules.mk
index 043949124..7dc7c6f6d 100644
--- a/keyboards/sowbug/68keys/rules.mk
+++ b/keyboards/sowbug/68keys/rules.mk
@@ -1,34 +1,27 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000 5BOOTLOADER = stm32duino
6MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
7BOARD = STM32_F103_STM32DUINO
8
9DFU_ARGS = -d 1eaf:0003 -a2 -R
10DFU_SUFFIX_ARGS = -v 1eaf -p 0003
11 6
12# Build Options 7# Build Options
13# comment out to disable the options. 8# change yes to no to disable
14# 9#
15BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
16MOUSEKEY_ENABLE = yes # Mouse keys 11MOUSEKEY_ENABLE = yes # Mouse keys
17EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
18CONSOLE_ENABLE = no 13CONSOLE_ENABLE = no # Console for debug
19COMMAND_ENABLE = no # Commands for debug and configuration 14COMMAND_ENABLE = no # Commands for debug and configuration
20SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
21NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
22AUDIO_ENABLE = no 17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
23RGB_MATRIX_ENABLE = yes 23RGB_MATRIX_ENABLE = yes
24RGB_MATRIX_DRIVER = WS2812 24RGB_MATRIX_DRIVER = WS2812
25 25
26# Want backlighting and RGB Matrix patterns? See the note in the readme,
27# apply the patches, and then uncomment the lines below as well as the one in
28# config.h.
29#
30# BACKLIGHT_ENABLE = yes
31# BACKLIGHT_DRIVER = rgb_matrix
32
33# Enter lower-power sleep mode when on the ChibiOS idle thread 26# Enter lower-power sleep mode when on the ChibiOS idle thread
34OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 27OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/sowbug/ansi_tkl/bootloader_defs.h b/keyboards/sowbug/ansi_tkl/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/sowbug/ansi_tkl/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/sowbug/ansi_tkl/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk
index 043949124..7dc7c6f6d 100644
--- a/keyboards/sowbug/ansi_tkl/rules.mk
+++ b/keyboards/sowbug/ansi_tkl/rules.mk
@@ -1,34 +1,27 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000 5BOOTLOADER = stm32duino
6MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
7BOARD = STM32_F103_STM32DUINO
8
9DFU_ARGS = -d 1eaf:0003 -a2 -R
10DFU_SUFFIX_ARGS = -v 1eaf -p 0003
11 6
12# Build Options 7# Build Options
13# comment out to disable the options. 8# change yes to no to disable
14# 9#
15BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
16MOUSEKEY_ENABLE = yes # Mouse keys 11MOUSEKEY_ENABLE = yes # Mouse keys
17EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
18CONSOLE_ENABLE = no 13CONSOLE_ENABLE = no # Console for debug
19COMMAND_ENABLE = no # Commands for debug and configuration 14COMMAND_ENABLE = no # Commands for debug and configuration
20SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
21NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
22AUDIO_ENABLE = no 17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
23RGB_MATRIX_ENABLE = yes 23RGB_MATRIX_ENABLE = yes
24RGB_MATRIX_DRIVER = WS2812 24RGB_MATRIX_DRIVER = WS2812
25 25
26# Want backlighting and RGB Matrix patterns? See the note in the readme,
27# apply the patches, and then uncomment the lines below as well as the one in
28# config.h.
29#
30# BACKLIGHT_ENABLE = yes
31# BACKLIGHT_DRIVER = rgb_matrix
32
33# Enter lower-power sleep mode when on the ChibiOS idle thread 26# Enter lower-power sleep mode when on the ChibiOS idle thread
34OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 27OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE