1
0
Fork 0

Set MCU for some F103 boards (#8459)

This commit is contained in:
Ryan 2020-03-19 12:33:17 +11:00 committed by GitHub
parent c2013f0b7c
commit 3a0f11eb27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 105 deletions

View file

@ -1,23 +1,10 @@
SRC += matrix.c # MCU name
QUANTUM_LIB_SRC += i2c_master.c MCU = STM32F103
CFLAGS += "-Wno-error=deprecated"
MCU_FAMILY = STM32
MCU_SERIES = STM32F1xx
MCU_LDSCRIPT = stm32f103_bootloader MCU_LDSCRIPT = stm32f103_bootloader
MCU_STARTUP = stm32f1xx
BOARD = ERGODOX_STM32_BOARD BOARD = ERGODOX_STM32_BOARD
MCU = cortex-m3 CFLAGS += "-Wno-error=deprecated"
ARMV = 7
OPT_DEFS =
EXTRAFLAGS = -O0 -g EXTRAFLAGS = -O0 -g
BOOTMAGIC_ENABLE = no BOOTMAGIC_ENABLE = no
@ -31,6 +18,8 @@ CUSTOM_MATRIX = yes # Custom matrix file
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
UNICODE_ENABLE = yes # Unicode UNICODE_ENABLE = yes # Unicode
# 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
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c

View file

@ -1,51 +1,9 @@
# project specific files # MCU name
SRC = matrix.c \ MCU = STM32F103
led.c
# GENERIC STM32F103C8T6 board - stm32duino bootloader
#OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000
#MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
#BOARD = GENERIC_STM32_F103
# GENERIC STM32F103C8T6 board - no bootloader (programmer over serial or SWD) // Modified by Xydane
OPT_DEFS =
MCU_LDSCRIPT = STM32F103x8
BOARD = GENERIC_STM32_F103
# MAPLE MINI
# OPT_DEFS = -DCORTEX_VTOR_INIT=0x5000
# MCU_LDSCRIPT = STM32F103xB_maplemini_bootloader
# BOARD = MAPLEMINI_STM32_F103
## chip/board settings
# the next two should match the directories in
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F1xx
# linker script to use
# it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <this_dir>/ld/
# startup code to use
# is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP = stm32f1xx
# it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
# Cortex version
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
MCU = cortex-m3
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
# If you want to be able to jump to bootloader from firmware on STM32 MCUs,
# set the correct BOOTLOADER_ADDRESS. Either set it here, or define it in
# ./bootloader_defs.h or in ./boards/<FOO>/bootloader_defs.h (if you have
# a custom board definition that you plan to reuse).
# If you're not setting it here, leave it commented out.
# 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
#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800
# 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
# project specific files
SRC = matrix.c \
led.c

View file

@ -1,41 +1,9 @@
# project specific files # MCU name
SRC = matrix.c \ MCU = STM32F103
led.c
## chip/board settings
# - the next two should match the directories in
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F1xx
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <this_dir>/ld/
# - NOTE: a custom ld script is needed for EEPROM on Teensy LC
MCU_LDSCRIPT = jm60_bootloader MCU_LDSCRIPT = jm60_bootloader
# Startup code to use
# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP = stm32f1xx
# Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
BOARD = JM60_BOARD BOARD = JM60_BOARD
# Cortex version
# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
MCU = cortex-m3
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
# I.e. 6 for Teensy LC; 7 for Teensy 3.x
ARMV = 7
# Vector table for application
# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
#OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
OPT_DEFS =
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -51,10 +19,9 @@ CUSTOM_MATRIX = yes # Custom matrix file
BACKLIGHT_ENABLE = no BACKLIGHT_ENABLE = no
VISUALIZER_ENABLE = no VISUALIZER_ENABLE = no
#LED_DRIVER = is31fl3731c
#LED_WIDTH = 16
#LED_HEIGHT = 5
# 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
# project specific files
SRC = matrix.c \
led.c