diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-23 04:02:16 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-23 04:02:16 +0000 |
| commit | 19fd0108d3910b4856b1587acf11c8e4052cb7cc (patch) | |
| tree | 4bd249538732512de966d768016169f383f21acc /quantum/mcu_selection.mk | |
| parent | 529dad88ddac0e64fce06bd6744884606f9d07cd (diff) | |
| parent | 806aa9bc67c77c3899e60c1daef560680865568c (diff) | |
| download | qmk_firmware-19fd0108d3910b4856b1587acf11c8e4052cb7cc.tar.gz qmk_firmware-19fd0108d3910b4856b1587acf11c8e4052cb7cc.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/mcu_selection.mk')
| -rw-r--r-- | quantum/mcu_selection.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk index 9518a6463..6b11eb498 100644 --- a/quantum/mcu_selection.mk +++ b/quantum/mcu_selection.mk | |||
| @@ -16,7 +16,6 @@ ifneq ($(findstring MKL26Z64, $(MCU)),) | |||
| 16 | # Linker script to use | 16 | # Linker script to use |
| 17 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 17 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
| 18 | # or <keyboard_dir>/ld/ | 18 | # or <keyboard_dir>/ld/ |
| 19 | # - NOTE: a custom ld script is needed for EEPROM on Teensy LC | ||
| 20 | MCU_LDSCRIPT ?= MKL26Z64 | 19 | MCU_LDSCRIPT ?= MKL26Z64 |
| 21 | 20 | ||
| 22 | # Startup code to use | 21 | # Startup code to use |