Move chibios/cortex selection to local Makefiles.

diff --git a/keyboard/stm32_onekey/Makefile b/keyboard/stm32_onekey/Makefile
index d84bfa4bbd865e13ad63afdb9861e49513e7b7aa..3868ee3d38481f3a41df14f3288b3247e94910e0 100644 (file)
--- a/keyboard/stm32_onekey/Makefile
+++ b/keyboard/stm32_onekey/Makefile
@@ -35,6 +35,9 @@ MCU_STARTUP = stm32f0xx
 # it should exist either in <chibios>/os/hal/boards/
 #  or <this_dir>/boards
 BOARD = ST_STM32F072B_DISCOVERY
+# Cortex version
+# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4
+MCU  = cortex-m0
 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 ARMV = 6
 # If you want to be able to jump to bootloader from firmware on STM32 MCUs,

diff --git a/tmk_core/tool/chibios/chibios.mk b/tmk_core/tool/chibios/chibios.mk
index d1738c139a3beab658d6d03d3d26142066b7e883..0f6af53db3cecf9212eb015bed976c064715a620 100644 (file)
--- a/tmk_core/tool/chibios/chibios.mk
+++ b/tmk_core/tool/chibios/chibios.mk
@@ -162,8 +162,6 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
 # Compiler settings
 #
 
-MCU  = cortex-m0
-
 #TRGT = arm-elf-
 TRGT = arm-none-eabi-
 CC   = $(TRGT)gcc