jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unconditionally enable ChibiOS syscalls (#8268)

Browse Source 
* Enable syscalls all the time

* fix whitespace
This commit is contained in:
Joel Challis
2020-02-29 22:45:21 +00:00
committed by Drashna Jael're
parent f713abefb9
commit 4f5daf4528
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tmk_core/chibios.mk
View File

@@ -122,9 +122,10 @@ CHIBISRC = $(STARTUPSRC) \
$(PLATFORMSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \ $(BOARDSRC) \
$(STREAMSSRC) \ $(STREAMSSRC) \
$(STARTUPASM) \ $(CHIBIOS)/os/various/syscalls.c
$(PORTASM) \
$(OSALASM) # Ensure the ASM files are not subjected to LTO -- it'll strip out interrupt handlers otherwise.
QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM)
CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC)) CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC))

14
tmk_core/common.mk
View File

@@ -27,22 +27,12 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
ifeq ($(PLATFORM),AVR) ifeq ($(PLATFORM),AVR)
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
endif else ifeq ($(PLATFORM),CHIBIOS)
ifeq ($(PLATFORM),CHIBIOS)
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes) else ifeq ($(PLATFORM),ARM_ATSAM)
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)
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
endif endif
# Option modules # Option modules
BOOTMAGIC_ENABLE ?= no BOOTMAGIC_ENABLE ?= no
VALID_MAGIC_TYPES := yes full lite VALID_MAGIC_TYPES := yes full lite