diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 02:13:19 +0100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 02:13:19 +0100 |
| commit | c9ba618654417ec115809a031d315f8327c79ad4 (patch) | |
| tree | cd5b907af5bebde7062897ff847e473232ed1214 /keyboards/planck/rev6/rules.mk | |
| parent | 2bb2977c133646c4e056960e72029270d77cc1eb (diff) | |
| parent | d977daa8dc9136746425f9e1414e1f93cb161877 (diff) | |
| download | qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.gz qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.xz | |
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
# quantum/matrix.c
Diffstat (limited to 'keyboards/planck/rev6/rules.mk')
| -rw-r--r-- | keyboards/planck/rev6/rules.mk | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk index dce683a7f..1f3d1dfe5 100644 --- a/keyboards/planck/rev6/rules.mk +++ b/keyboards/planck/rev6/rules.mk @@ -2,41 +2,8 @@ SRC = matrix.c LAYOUTS += ortho_4x12 -## chip/board settings -# - the next two should match the directories in -# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F3xx - -# Linker script to use -# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ -# or <this_dir>/ld/ -MCU_LDSCRIPT = STM32F303xC - -# Startup code to use -# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f3xx - -# Board: it should exist either in <chibios>/os/hal/boards/ -# or <this_dir>/boards -BOARD = GENERIC_STM32_F303XC - # Cortex version -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 - -USE_FPU = yes - -# 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=0x08005000 -OPT_DEFS = - -# Options to pass to dfu-util when flashing -DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave +MCU = STM32F303 # Build Options # comment out to disable the options. |