hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add STM32Duino to bootloader selection (#10558)

Browse Source
pre-develop-merge-nov20 0.10.34
Ryan 5 years ago committed by GitHub
parent adc06c5b3b
commit d46b8ef67c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 36 additions and 147 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      bootloader.mk
  2. 10
      keyboards/cannonkeys/ortho48/bootloader_defs.h
  3. 8
      keyboards/cannonkeys/ortho48/rules.mk
  4. 10
      keyboards/cannonkeys/ortho60/bootloader_defs.h
  5. 8
      keyboards/cannonkeys/ortho60/rules.mk
  6. 10
      keyboards/cannonkeys/ortho75/bootloader_defs.h
  7. 8
      keyboards/cannonkeys/ortho75/rules.mk
  8. 10
      keyboards/cannonkeys/practice60/bootloader_defs.h
  9. 8
      keyboards/cannonkeys/practice60/rules.mk
  10. 10
      keyboards/cannonkeys/practice65/bootloader_defs.h
  11. 8
      keyboards/cannonkeys/practice65/rules.mk
  12. 10
      keyboards/converter/siemens_tastatur/bootloader_defs.h
  13. 8
      keyboards/converter/siemens_tastatur/rules.mk
  14. 10
      keyboards/handwired/onekey/bluepill/bootloader_defs.h
  15. 9
      keyboards/handwired/onekey/bluepill/rules.mk
  16. 9
      keyboards/handwired/t111/rules.mk
  17. 9
      keyboards/handwired/z150/rules.mk
  18. 11
      keyboards/wolfmarkclub/wm1/bootloader_defs.h
  19. 6
      keyboards/wolfmarkclub/wm1/rules.mk
  20. 9
      keyboards/zvecr/split_blackpill/rules.mk

12
bootloader.mk
Unescape View File

@ -28,6 +28,7 @@
# bootloadHID HIDBootFlash compatible (ATmega32A) # bootloadHID HIDBootFlash compatible (ATmega32A)
# USBasp USBaspLoader (ATmega328P) # USBasp USBaspLoader (ATmega328P)
# kiibohd Input:Club Kiibohd bootloader (only used on their boards) # kiibohd Input:Club Kiibohd bootloader (only used on their boards)
# stm32duino STM32Duino (STM32F103x8)
# #
# BOOTLOADER_SIZE can still be defined manually, but it's recommended # BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list # you add any possible configuration to this list
@ -106,3 +107,14 @@ ifeq ($(strip $(BOOTLOADER)), kiibohd)
DFU_ARGS = -d 1C11:B007 DFU_ARGS = -d 1C11:B007
DFU_SUFFIX_ARGS = -v 1C11 -p B007 DFU_SUFFIX_ARGS = -v 1C11 -p B007
endif endif
ifeq ($(strip $(BOOTLOADER)), stm32duino)
OPT_DEFS += -DBOOTLOADER_STM32DUINO
MCU_LDSCRIPT ?= STM32F103x8_stm32duino_bootloader
BOARD = STM32_F103_STM32DUINO
# STM32F103 does NOT have an USB bootloader in ROM (only serial), so setting anything here does not make much sense
STM32_BOOTLOADER_ADDRESS = 0x80000000
DFU_ARGS = -d 1EAF:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
endif

10
keyboards/cannonkeys/ortho48/bootloader_defs.h
Unescape View File

@ -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

8
keyboards/cannonkeys/ortho48/rules.mk
Unescape View File

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# project specific files # project specific files
VPATH += keyboards/cannonkeys/bluepill VPATH += keyboards/cannonkeys/bluepill

10
keyboards/cannonkeys/ortho60/bootloader_defs.h
Unescape View File

@ -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

8
keyboards/cannonkeys/ortho60/rules.mk
Unescape View File

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# project specific files # project specific files
VPATH += keyboards/cannonkeys/bluepill VPATH += keyboards/cannonkeys/bluepill

10
keyboards/cannonkeys/ortho75/bootloader_defs.h
Unescape View File

@ -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

8
keyboards/cannonkeys/ortho75/rules.mk
Unescape View File

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# project specific files # project specific files
VPATH += keyboards/cannonkeys/bluepill VPATH += keyboards/cannonkeys/bluepill

10
keyboards/cannonkeys/practice60/bootloader_defs.h
Unescape View File

@ -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

8
keyboards/cannonkeys/practice60/rules.mk
Unescape View File

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# project specific files # project specific files
VPATH += keyboards/cannonkeys/bluepill VPATH += keyboards/cannonkeys/bluepill

10
keyboards/cannonkeys/practice65/bootloader_defs.h
Unescape View File

@ -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

8
keyboards/cannonkeys/practice65/rules.mk
Unescape View File

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# project specific files # project specific files
VPATH += keyboards/cannonkeys/bluepill VPATH += keyboards/cannonkeys/bluepill

10
keyboards/converter/siemens_tastatur/bootloader_defs.h
Unescape View File

@ -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

8
keyboards/converter/siemens_tastatur/rules.mk
Unescape View File

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
SRC = matrix.c SRC = matrix.c

10
keyboards/handwired/onekey/bluepill/bootloader_defs.h
Unescape View File

@ -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

9
keyboards/handwired/onekey/bluepill/rules.mk
Unescape View File

@ -1,13 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

9
keyboards/handwired/t111/rules.mk
Unescape View File

@ -1,12 +1,7 @@
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
STM32_BOOTLOADER_ADDRESS = 0x80000000
DFU_ARGS = -d 1EAF:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

9
keyboards/handwired/z150/rules.mk
Unescape View File

@ -1,12 +1,7 @@
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
STM32_BOOTLOADER_ADDRESS = 0x80000000
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

11
keyboards/wolfmarkclub/wm1/bootloader_defs.h
Unescape View File

@ -1,11 +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 a USB bootloader in ROM -- the WM1
// has a usermode USB mass storage device bootloader at the normal
// boot address -- `0x08000000`.
#define STM32_BOOTLOADER_ADDRESS 0x80000000

6
keyboards/wolfmarkclub/wm1/rules.mk
Unescape View File

@ -1,11 +1,13 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# Bootloader selection
BOOTLOADER = stm32duino
# GENERIC STM32F103C8T6 board - mass storage bootloader # GENERIC STM32F103C8T6 board - mass storage bootloader
MCU_LDSCRIPT = wm1_f103 MCU_LDSCRIPT = wm1_f103
BOARD = STM32_F103_STM32DUINO
PROGRAM_CMD=echo 'CLI flashing not supported' >&2 PROGRAM_CMD = echo 'CLI flashing not supported' >&2
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

9
keyboards/zvecr/split_blackpill/rules.mk
Unescape View File

@ -1,13 +1,8 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# GENERIC STM32F103C8T6 board - stm32duino bootloader # Bootloader selection
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader BOOTLOADER = stm32duino
BOARD = STM32_F103_STM32DUINO
STM32_BOOTLOADER_ADDRESS = 0x80000000
DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

Write Preview
Loading…
Cancel
Save