summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-03-21 05:20:04 +0000
committerFlorian Didron <fdidron@users.noreply.github.com>2020-06-12 17:00:27 +0900
commitae6a8965ad345204de4ab631823b261364484962 (patch)
tree601dead00748cb286adfbbda1e70b0c6e0f99a1d /tmk_core
parent0b34abe5b860b7819db885bded2993483d0f0df6 (diff)
Initial arm->chibios pass - simplify some platform logic (#8450)
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/chibios.mk2
-rw-r--r--tmk_core/common.mk14
2 files changed, 3 insertions, 13 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index a7954be5bb..7a7d49d343 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 bcd38240e6..835146f65f 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 \
@@ -184,6 +176,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)