diff options
| author | Joel Challis <git@zvecr.com> | 2020-03-21 05:20:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-21 16:20:04 +1100 |
| commit | d96380e65496912e0f68e6531565f4b45efd1623 (patch) | |
| tree | 63e903f65b4fdc44c75c7eff21e076fdb200dca7 /tmk_core | |
| parent | 7e80686f1e400010a8a800cc73c4896936f337de (diff) | |
Initial arm->chibios pass - simplify some platform logic (#8450)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/chibios.mk | 2 | ||||
| -rw-r--r-- | tmk_core/common.mk | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 014019ef04..b400e9e0f1 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -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 diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 6863929cee..b766ebe97e 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -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) |