~ruther/qmk_firmware

d46b8ef67c91f1794c35a1a91ff9fc7dcba6b009 — Ryan 4 years ago adc06c5 
Add STM32Duino to bootloader selection (#10558)
patch browse .tar.gz 
20 files changed, 36 insertions(+), 147 deletions(-)

M bootloader.mk
D keyboards/cannonkeys/ortho48/bootloader_defs.h
M keyboards/cannonkeys/ortho48/rules.mk
D keyboards/cannonkeys/ortho60/bootloader_defs.h
M keyboards/cannonkeys/ortho60/rules.mk
D keyboards/cannonkeys/ortho75/bootloader_defs.h
M keyboards/cannonkeys/ortho75/rules.mk
D keyboards/cannonkeys/practice60/bootloader_defs.h
M keyboards/cannonkeys/practice60/rules.mk
D keyboards/cannonkeys/practice65/bootloader_defs.h
M keyboards/cannonkeys/practice65/rules.mk
D keyboards/converter/siemens_tastatur/bootloader_defs.h
M keyboards/converter/siemens_tastatur/rules.mk
D keyboards/handwired/onekey/bluepill/bootloader_defs.h
M keyboards/handwired/onekey/bluepill/rules.mk
M keyboards/handwired/t111/rules.mk
M keyboards/handwired/z150/rules.mk
D keyboards/wolfmarkclub/wm1/bootloader_defs.h
M keyboards/wolfmarkclub/wm1/rules.mk
M keyboards/zvecr/split_blackpill/rules.mk

M bootloader.mk => bootloader.mk +12 -0
@@ 28,6 28,7 @@
# bootloadHID    HIDBootFlash compatible (ATmega32A)
# USBasp         USBaspLoader (ATmega328P)
# kiibohd        Input:Club Kiibohd bootloader (only used on their boards)
# stm32duino     STM32Duino (STM32F103x8)
#
# BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list


@@ 106,3 107,14 @@ ifeq ($(strip $(BOOTLOADER)), kiibohd)
    DFU_ARGS = -d 1C11:B007
    DFU_SUFFIX_ARGS = -v 1C11 -p B007
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


D keyboards/cannonkeys/ortho48/bootloader_defs.h => keyboards/cannonkeys/ortho48/bootloader_defs.h +0 -10
@@ 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


M keyboards/cannonkeys/ortho48/rules.mk => keyboards/cannonkeys/ortho48/rules.mk +2 -6
@@ 1,12 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
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

# project specific files
VPATH += keyboards/cannonkeys/bluepill


D keyboards/cannonkeys/ortho60/bootloader_defs.h => keyboards/cannonkeys/ortho60/bootloader_defs.h +0 -10
@@ 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


M keyboards/cannonkeys/ortho60/rules.mk => keyboards/cannonkeys/ortho60/rules.mk +2 -6
@@ 1,12 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
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

# project specific files
VPATH += keyboards/cannonkeys/bluepill


D keyboards/cannonkeys/ortho75/bootloader_defs.h => keyboards/cannonkeys/ortho75/bootloader_defs.h +0 -10
@@ 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


M keyboards/cannonkeys/ortho75/rules.mk => keyboards/cannonkeys/ortho75/rules.mk +2 -6
@@ 1,12 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
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

# project specific files
VPATH += keyboards/cannonkeys/bluepill


D keyboards/cannonkeys/practice60/bootloader_defs.h => keyboards/cannonkeys/practice60/bootloader_defs.h +0 -10
@@ 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


M keyboards/cannonkeys/practice60/rules.mk => keyboards/cannonkeys/practice60/rules.mk +2 -6
@@ 1,12 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
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

# project specific files
VPATH += keyboards/cannonkeys/bluepill


D keyboards/cannonkeys/practice65/bootloader_defs.h => keyboards/cannonkeys/practice65/bootloader_defs.h +0 -10
@@ 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


M keyboards/cannonkeys/practice65/rules.mk => keyboards/cannonkeys/practice65/rules.mk +2 -6
@@ 1,12 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
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

# project specific files
VPATH += keyboards/cannonkeys/bluepill


D keyboards/converter/siemens_tastatur/bootloader_defs.h => keyboards/converter/siemens_tastatur/bootloader_defs.h +0 -10
@@ 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


M keyboards/converter/siemens_tastatur/rules.mk => keyboards/converter/siemens_tastatur/rules.mk +2 -6
@@ 1,12 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
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

SRC = matrix.c



D keyboards/handwired/onekey/bluepill/bootloader_defs.h => keyboards/handwired/onekey/bluepill/bootloader_defs.h +0 -10
@@ 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


M keyboards/handwired/onekey/bluepill/rules.mk => keyboards/handwired/onekey/bluepill/rules.mk +2 -7
@@ 1,13 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
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

# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE


M keyboards/handwired/t111/rules.mk => keyboards/handwired/t111/rules.mk +2 -7
@@ 1,12 1,7 @@
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
BOARD = STM32_F103_STM32DUINO
STM32_BOOTLOADER_ADDRESS = 0x80000000

DFU_ARGS = -d 1EAF:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
# Bootloader selection
BOOTLOADER = stm32duino

# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE


M keyboards/handwired/z150/rules.mk => keyboards/handwired/z150/rules.mk +2 -7
@@ 1,12 1,7 @@
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
BOARD = STM32_F103_STM32DUINO
STM32_BOOTLOADER_ADDRESS = 0x80000000

DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# Bootloader selection
BOOTLOADER = stm32duino

# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE


D keyboards/wolfmarkclub/wm1/bootloader_defs.h => keyboards/wolfmarkclub/wm1/bootloader_defs.h +0 -11
@@ 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


M keyboards/wolfmarkclub/wm1/rules.mk => keyboards/wolfmarkclub/wm1/rules.mk +4 -2
@@ 1,11 1,13 @@
# MCU name
MCU = STM32F103

# Bootloader selection
BOOTLOADER = stm32duino

# GENERIC STM32F103C8T6 board - mass storage bootloader
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
#   change yes to no to disable


M keyboards/zvecr/split_blackpill/rules.mk => keyboards/zvecr/split_blackpill/rules.mk +2 -7
@@ 1,13 1,8 @@
# MCU name
MCU = STM32F103

# GENERIC STM32F103C8T6 board - stm32duino bootloader
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
BOARD = STM32_F103_STM32DUINO
STM32_BOOTLOADER_ADDRESS = 0x80000000

DFU_ARGS = -d 1eaf:0003 -a2 -R
DFU_SUFFIX_ARGS = -v 1eaf -p 0003
# Bootloader selection
BOOTLOADER = stm32duino

# Build Options
#   change yes to no to disable