Move protocol makefiles into their respective folders (qmk#21332)

* Move protocol makefiles into their respective folders * Fix USB-USB converter
freznel10 · Jun 22, 2023 · aad5746 · aad5746
1 parent fb76c94
commit aad5746
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 → tmk_core/protocol/arm_atsam/arm_atsam.mk b/tmk_core/protocol/arm_atsam.mk → tmk_core/protocol/arm_atsam/arm_atsam.mk
diff --git a/tmk_core/protocol/chibios.mk → tmk_core/protocol/chibios/chibios.mk b/tmk_core/protocol/chibios.mk → tmk_core/protocol/chibios/chibios.mk
diff --git a/tmk_core/protocol/lufa.mk → tmk_core/protocol/lufa/lufa.mk b/tmk_core/protocol/lufa.mk → tmk_core/protocol/lufa/lufa.mk
diff --git a/tmk_core/protocol/usb_hid.mk → tmk_core/protocol/usb_hid/usb_hid.mk b/tmk_core/protocol/usb_hid.mk → tmk_core/protocol/usb_hid/usb_hid.mk
diff --git a/tmk_core/protocol/vusb.mk → tmk_core/protocol/vusb/vusb.mk b/tmk_core/protocol/vusb.mk → tmk_core/protocol/vusb/vusb.mk