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/common.mk | |
| parent | 7e80686f1e400010a8a800cc73c4896936f337de (diff) | |
| download | qmk_firmware-d96380e65496912e0f68e6531565f4b45efd1623.tar.gz qmk_firmware-d96380e65496912e0f68e6531565f4b45efd1623.zip | |
Initial arm->chibios pass - simplify some platform logic (#8450)
Diffstat (limited to 'tmk_core/common.mk')
| -rw-r--r-- | tmk_core/common.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 6863929ce..b766ebe97 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -1,13 +1,5 @@ | |||
| 1 | COMMON_DIR = common | 1 | COMMON_DIR = common |
| 2 | ifeq ($(PLATFORM),AVR) | 2 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) |
| 3 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr | ||
| 4 | else ifeq ($(PLATFORM),CHIBIOS) | ||
| 5 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/chibios | ||
| 6 | else ifeq ($(PLATFORM),ARM_ATSAM) | ||
| 7 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/arm_atsam | ||
| 8 | else | ||
| 9 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/test | ||
| 10 | endif | ||
| 11 | 3 | ||
| 12 | TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | 4 | TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ |
| 13 | $(COMMON_DIR)/keyboard.c \ | 5 | $(COMMON_DIR)/keyboard.c \ |
| @@ -179,6 +171,4 @@ endif | |||
| 179 | 171 | ||
| 180 | # Search Path | 172 | # Search Path |
| 181 | VPATH += $(TMK_PATH)/$(COMMON_DIR) | 173 | VPATH += $(TMK_PATH)/$(COMMON_DIR) |
| 182 | ifeq ($(PLATFORM),CHIBIOS) | 174 | VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR) |
| 183 | VPATH += $(TMK_PATH)/$(COMMON_DIR)/chibios | ||
| 184 | endif | ||