diff options
| author | Joel Challis <git@zvecr.com> | 2020-02-29 22:45:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 09:45:21 +1100 |
| commit | 8d9c800da0cfcf109f264b695123b55282bc52df (patch) | |
| tree | dc9d4977a5671fb04949fa8c9b827f8a3e138fa8 | |
| parent | cae91510dc488bf81d8497252d58014353093872 (diff) | |
| download | qmk_firmware-8d9c800da0cfcf109f264b695123b55282bc52df.tar.gz qmk_firmware-8d9c800da0cfcf109f264b695123b55282bc52df.zip | |
Unconditionally enable ChibiOS syscalls (#8268)
* Enable syscalls all the time
* fix whitespace
| -rw-r--r-- | tmk_core/chibios.mk | 3 | ||||
| -rw-r--r-- | tmk_core/common.mk | 14 |
2 files changed, 4 insertions, 13 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 73c01c7b48..d447bc13ee 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -124,7 +124,8 @@ CHIBISRC = $(STARTUPSRC) \ $(PLATFORMSRC) \ $(PLATFORMSRC_CONTRIB) \ $(BOARDSRC) \ - $(STREAMSSRC) + $(STREAMSSRC) \ + $(CHIBIOS)/os/various/syscalls.c # Ensure the ASM files are not subjected to LTO -- it'll strip out interrupt handlers otherwise. QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 24b764800f..6863929cee 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -27,22 +27,12 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ ifeq ($(PLATFORM),AVR) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S -endif - -ifeq ($(PLATFORM),CHIBIOS) +else ifeq ($(PLATFORM),CHIBIOS) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c - ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes) - TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c - else ifeq ($(strip $(TERMINAL_ENABLE)), yes) - TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c - endif -endif - -ifeq ($(PLATFORM),ARM_ATSAM) +else ifeq ($(PLATFORM),ARM_ATSAM) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c endif - # Option modules BOOTMAGIC_ENABLE ?= no VALID_MAGIC_TYPES := yes full lite |