Rename some Makefile defines.

diff --git a/keyboard/chibi_onekey/Makefile b/keyboard/chibi_onekey/Makefile
index 0a88f075b850d4c67958ee7ba05d757f652431af..2d5ff8cdceb38892e9f215dbbc3f549fcbabb395 100644 (file)
--- a/keyboard/chibi_onekey/Makefile
+++ b/keyboard/chibi_onekey/Makefile
@@ -28,11 +28,14 @@ MCU_SERIES = STM32F0xx
 # linker script to use
 # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 #  or <this_dir>/ld/
-MCU_MODEL_FAMILY = STM32F072xB
+MCU_LDSCRIPT = STM32F072xB
+# startup code to use
+# is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
+MCU_STARTUP = stm32f0xx
 # it should exist either in <chibios>/os/hal/boards/
 #  or <this_dir>/boards
 BOARD = ST_STM32F072B_DISCOVERY
-# ARM version, M0/M1 are 6, M3/M4/M7 are 7
+# 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),
 # set the correct BOOTLOADER_ADDRESS here. Otherwise leave commented out.

diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index 3a7e76fc1da6dd0bac4618d2d2d88faf2ad00099..85ea9153452c570e09c3d2a1fd8df3497232cb93 100644 (file)
--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -127,7 +127,6 @@ typedef struct {
 
 /* Putchar over the USB console */
 int8_t sendchar(uint8_t c);
-/* wrapper for printf lib */
 
 /* Flush output (send everything immediately) */
 void console_flush_output(void);

diff --git a/tmk_core/tool/chibios/chibios.mk b/tmk_core/tool/chibios/chibios.mk
index ed5fd5b82f56a0adbc7ddc6646c398a35c53e6e5..6ba783e34c89959444675b6cf473113b5f5b63a3 100644 (file)
--- a/tmk_core/tool/chibios/chibios.mk
+++ b/tmk_core/tool/chibios/chibios.mk
@@ -85,7 +85,7 @@ endif
 # Imported source files and paths
 CHIBIOS = $(TMK_DIR)/tool/chibios/chibios
 # Startup files.
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_$(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]').mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_$(MCU_STARTUP).mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)/platform.mk
@@ -101,10 +101,10 @@ include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v$(ARMV)m.mk
 # Other files (optional).
 
 # Define linker script file here
-ifneq ("$(wildcard $(TARGET_DIR)/ld/$(MCU_MODEL_FAMILY).ld)","")
-LDSCRIPT = $(TARGET_DIR)/ld/$(MCU_MODEL_FAMILY).ld
+ifneq ("$(wildcard $(TARGET_DIR)/ld/$(MCU_LDSCRIPT).ld)","")
+LDSCRIPT = $(TARGET_DIR)/ld/$(MCU_LDSCRIPT).ld
 else
-LDSCRIPT = $(STARTUPLD)/$(MCU_MODEL_FAMILY).ld
+LDSCRIPT = $(STARTUPLD)/$(MCU_LDSCRIPT).ld
 endif
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global