max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename some Makefile defines.

Browse source
This commit is contained in:
flabbergast 2015-09-15 08:52:03 +01:00
parent 1bcf15a8ea
commit 438559f11d
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tmk_core/protocol/chibios/usb_main.h
View file

@ -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);

8
tmk_core/tool/chibios/chibios.mk
View file

@ -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