diff options
| author | Ryan <fauxpark@gmail.com> | 2023-06-23 00:07:28 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-22 15:07:28 +0100 |
| commit | aad57466827c6aac8f612f5fbbb5adcea6fc5975 (patch) | |
| tree | 45940a49fe72a1b56a77cf54555c872f00210138 | |
| parent | fb76c941ee9d0713c5fc2d2609b8381de14df184 (diff) | |
Move protocol makefiles into their respective folders (#21332)
* Move protocol makefiles into their respective folders
* Fix USB-USB converter
| -rw-r--r-- | builddefs/build_keyboard.mk | 5 | ||||
| -rw-r--r-- | tmk_core/protocol.mk | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/arm_atsam/arm_atsam.mk (renamed from tmk_core/protocol/arm_atsam.mk) | 0 | ||||
| -rw-r--r-- | tmk_core/protocol/chibios/chibios.mk (renamed from tmk_core/protocol/chibios.mk) | 0 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.mk (renamed from tmk_core/protocol/lufa.mk) | 0 | ||||
| -rw-r--r-- | tmk_core/protocol/usb_hid/usb_hid.mk (renamed from tmk_core/protocol/usb_hid.mk) | 0 | ||||
| -rw-r--r-- | tmk_core/protocol/vusb/vusb.mk (renamed from tmk_core/protocol/vusb.mk) | 0 |
7 files changed, 4 insertions, 3 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 32e41e7d5b..72c990abbb 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -440,10 +440,11 @@ include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk ifneq ($(strip $(PROTOCOL)),) - include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk +PROTOCOL_KEY = $(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')) else - include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk +PROTOCOL_KEY = $(PLATFORM_KEY) endif +include $(TMK_PATH)/protocol/$(PROTOCOL_KEY)/$(PROTOCOL_KEY).mk # Setup definitions based on the selected MCU $(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU)) diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk index d3f15c4588..2ae7aa9abe 100644 --- a/tmk_core/protocol.mk +++ b/tmk_core/protocol.mk @@ -99,7 +99,7 @@ ifeq ($(strip $(SHARED_EP_ENABLE)), yes) endif ifeq ($(strip $(USB_HID_ENABLE)), yes) - include $(TMK_DIR)/protocol/usb_hid.mk + include $(TMK_DIR)/protocol/usb_hid/usb_hid.mk endif # Search Path diff --git a/tmk_core/protocol/arm_atsam.mk b/tmk_core/protocol/arm_atsam/arm_atsam.mk index ffd1fa9f50..ffd1fa9f50 100644 --- a/tmk_core/protocol/arm_atsam.mk +++ b/tmk_core/protocol/arm_atsam/arm_atsam.mk diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios/chibios.mk index 8eaf5b10d2..8eaf5b10d2 100644 --- a/tmk_core/protocol/chibios.mk +++ b/tmk_core/protocol/chibios/chibios.mk diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa/lufa.mk index b048c1836c..b048c1836c 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa/lufa.mk diff --git a/tmk_core/protocol/usb_hid.mk b/tmk_core/protocol/usb_hid/usb_hid.mk index c0c157c043..c0c157c043 100644 --- a/tmk_core/protocol/usb_hid.mk +++ b/tmk_core/protocol/usb_hid/usb_hid.mk diff --git a/tmk_core/protocol/vusb.mk b/tmk_core/protocol/vusb/vusb.mk index 5572597e21..5572597e21 100644 --- a/tmk_core/protocol/vusb.mk +++ b/tmk_core/protocol/vusb/vusb.mk |