drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Initial arm->chibios pass - simplify some platform logic (#8450)

Browse source
This commit is contained in:
Joel Challis 2020-03-21 05:20:04 +00:00 • committed by GitHub
parent 7e80686f1e
commit d96380e654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tmk_core/chibios.mk
View file

@ -179,7 +179,7 @@ HEX = $(OBJCOPY) -O $(FORMAT)
EEP =
BIN = $(OBJCOPY) -O binary
COMMON_VPATH += $(DRIVER_PATH)/arm
COMMON_VPATH += $(DRIVER_PATH)/chibios
THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB

14
tmk_core/common.mk
View file

@ -1,13 +1,5 @@
COMMON_DIR = common
ifeq ($(PLATFORM),AVR)
PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr
else ifeq ($(PLATFORM),CHIBIOS)
PLATFORM_COMMON_DIR = $(COMMON_DIR)/chibios
else ifeq ($(PLATFORM),ARM_ATSAM)
PLATFORM_COMMON_DIR = $(COMMON_DIR)/arm_atsam
else
PLATFORM_COMMON_DIR = $(COMMON_DIR)/test
endif
PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY)
TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/keyboard.c \
@ -179,6 +171,4 @@ endif
# Search Path
VPATH += $(TMK_PATH)/$(COMMON_DIR)
ifeq ($(PLATFORM),CHIBIOS)
VPATH += $(TMK_PATH)/$(COMMON_DIR)/chibios
endif
VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR)