diff options
| author | Joel Challis <git@zvecr.com> | 2021-08-17 23:43:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 23:43:09 +0100 |
| commit | 1bb7af4d446174b7181c9bb22dbd14c93642ea10 (patch) | |
| tree | 894eceeb29cc2c00f6b0f08a4ca177da7f172424 /tmk_core | |
| parent | 483691dd73e5260fac958c524e0a12e705db43f6 (diff) | |
| download | qmk_firmware-1bb7af4d446174b7181c9bb22dbd14c93642ea10.tar.gz qmk_firmware-1bb7af4d446174b7181c9bb22dbd14c93642ea10.zip | |
Relocate platform specific drivers (#13894)
* Relocate platform specific drivers
* Move stm eeprom
* Tidy up slightly
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 2 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 2 | ||||
| -rw-r--r-- | tmk_core/common.mk | 1 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index d7bee6d34..940e95397 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -12,8 +12,6 @@ HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature | |||
| 12 | EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) | 12 | EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) |
| 13 | BIN = | 13 | BIN = |
| 14 | 14 | ||
| 15 | COMMON_VPATH += $(DRIVER_PATH)/avr | ||
| 16 | |||
| 17 | COMPILEFLAGS += -funsigned-char | 15 | COMPILEFLAGS += -funsigned-char |
| 18 | COMPILEFLAGS += -funsigned-bitfields | 16 | COMPILEFLAGS += -funsigned-bitfields |
| 19 | COMPILEFLAGS += -ffunction-sections | 17 | COMPILEFLAGS += -ffunction-sections |
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index cbd9fff69..28aaaecba 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk | |||
| @@ -278,8 +278,6 @@ HEX = $(OBJCOPY) -O $(FORMAT) | |||
| 278 | EEP = | 278 | EEP = |
| 279 | BIN = $(OBJCOPY) -O binary | 279 | BIN = $(OBJCOPY) -O binary |
| 280 | 280 | ||
| 281 | COMMON_VPATH += $(DRIVER_PATH)/chibios | ||
| 282 | |||
| 283 | THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB | 281 | THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB |
| 284 | 282 | ||
| 285 | COMPILEFLAGS += -fomit-frame-pointer | 283 | COMPILEFLAGS += -fomit-frame-pointer |
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index fa907b47b..923a736d3 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -138,3 +138,4 @@ endif | |||
| 138 | # Search Path | 138 | # Search Path |
| 139 | VPATH += $(TMK_PATH)/$(COMMON_DIR) | 139 | VPATH += $(TMK_PATH)/$(COMMON_DIR) |
| 140 | VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR) | 140 | VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR) |
| 141 | VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR) | ||
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 514d5fac4..c8935dacb 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk | |||
| @@ -49,7 +49,6 @@ SRC += $(LUFA_DIR)/usb_util.c | |||
| 49 | # Search Path | 49 | # Search Path |
| 50 | VPATH += $(TMK_PATH)/$(LUFA_DIR) | 50 | VPATH += $(TMK_PATH)/$(LUFA_DIR) |
| 51 | VPATH += $(LUFA_PATH) | 51 | VPATH += $(LUFA_PATH) |
| 52 | VPATH += $(DRIVER_PATH)/avr | ||
| 53 | 52 | ||
| 54 | # Option modules | 53 | # Option modules |
| 55 | #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) | 54 | #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) |
