Skip to content

Commit

Permalink
Unconditionally enable ChibiOS syscalls (qmk#8268)
Browse files Browse the repository at this point in the history
* Enable syscalls all the time

* fix whitespace
  • Loading branch information
zvecr authored and kujawakk committed Apr 21, 2020
1 parent 8a2e497 commit 10a89e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
3 changes: 2 additions & 1 deletion tmk_core/chibios.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 2 additions & 12 deletions tmk_core/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 10a89e3

Please sign in to comment.