qmk · drashna · Nov 19, 2021 · Oct 28, 2021 · Oct 28, 2021 · Nov 17, 2021
diff --git a/build_keyboard.mk b/build_keyboard.mk
@@ -388,7 +388,7 @@ VPATH += $(COMMON_VPATH)
 include common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(TMK_PATH)/protocol.mk
-include $(TMK_PATH)/common.mk
+include $(PLATFORM_PATH)/common.mk
 include $(BUILDDEFS_PATH)/bootloader.mk
 
 SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
@@ -404,13 +404,14 @@ ifneq ($(REQUIRE_PLATFORM_KEY),)
     endif
 endif
 
-include $(TMK_PATH)/$(PLATFORM_KEY).mk
+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
 else
     include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
 endif
--include $(TOP_DIR)/platforms/$(PLATFORM_KEY)/flash.mk
 
 # TODO: remove this bodge?
 PROJECT_DEFS := $(OPT_DEFS)

diff --git a/build_test.mk b/build_test.mk
@@ -54,11 +54,11 @@ endif
 
 include common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
-include $(TMK_PATH)/common.mk
+include $(PLATFORM_PATH)/common.mk
 include $(TMK_PATH)/protocol.mk
 include $(QUANTUM_PATH)/debounce/tests/rules.mk
 include $(QUANTUM_PATH)/sequencer/tests/rules.mk
-include $(TMK_PATH)/common/test/rules.mk
+include $(PLATFORM_PATH)/test/rules.mk
 ifneq ($(filter $(FULL_TESTS),$(TEST)),)
 include build_full_test.mk
 endif
@@ -73,7 +73,7 @@ $(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
 $(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
 $(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
 
-include $(TMK_PATH)/native.mk
+include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 include $(TMK_PATH)/rules.mk
 
 

diff --git a/common_features.mk b/common_features.mk
@@ -33,8 +33,10 @@ QUANTUM_SRC += \
 
 VPATH += $(QUANTUM_DIR)/logging
 # Fall back to lib/printf if there is no platform provided print
-ifeq ("$(wildcard $(TMK_PATH)/common/$(PLATFORM_KEY)/printf.mk)","")
+ifeq ("$(wildcard $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk)","")
     include $(QUANTUM_PATH)/logging/print.mk
+else
+    include $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk
 endif
 
 ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)

diff --git a/paths.mk b/paths.mk
@@ -13,6 +13,9 @@ DRIVER_PATH = $(DRIVER_DIR)
 PLATFORM_DIR = platforms
 PLATFORM_PATH = $(PLATFORM_DIR)
 
+PROTOCOL_DIR = protocol
+PROTOCOL_PATH = $(TMK_DIR)/$(PROTOCOL_DIR)
+
 BUILDDEFS_DIR = builddefs
 BUILDDEFS_PATH = $(BUILDDEFS_DIR)
 

diff --git a/tmk_core/common/arm_atsam/_timer.h → platforms/arm_atsam/_timer.h b/tmk_core/common/arm_atsam/_timer.h → platforms/arm_atsam/_timer.h
diff --git a/tmk_core/common/arm_atsam/_wait.h → platforms/arm_atsam/_wait.h b/tmk_core/common/arm_atsam/_wait.h → platforms/arm_atsam/_wait.h
diff --git a/tmk_core/common/arm_atsam/atomic_util.h → platforms/arm_atsam/atomic_util.h b/tmk_core/common/arm_atsam/atomic_util.h → platforms/arm_atsam/atomic_util.h
diff --git a/tmk_core/common/arm_atsam/bootloader.c → platforms/arm_atsam/bootloader.c b/tmk_core/common/arm_atsam/bootloader.c → platforms/arm_atsam/bootloader.c
diff --git a/tmk_core/common/arm_atsam/eeprom.c → platforms/arm_atsam/eeprom.c b/tmk_core/common/arm_atsam/eeprom.c → platforms/arm_atsam/eeprom.c
diff --git a/tmk_core/common/arm_atsam/gpio.h → platforms/arm_atsam/gpio.h b/tmk_core/common/arm_atsam/gpio.h → platforms/arm_atsam/gpio.h
diff --git a/tmk_core/common/arm_atsam/pin_defs.h → platforms/arm_atsam/pin_defs.h b/tmk_core/common/arm_atsam/pin_defs.h → platforms/arm_atsam/pin_defs.h
diff --git a/tmk_core/common/arm_atsam/platform.c → platforms/arm_atsam/platform.c b/tmk_core/common/arm_atsam/platform.c → platforms/arm_atsam/platform.c
diff --git a/tmk_core/arm_atsam.mk → platforms/arm_atsam/platform.mk b/tmk_core/arm_atsam.mk → platforms/arm_atsam/platform.mk
diff --git a/tmk_core/common/arm_atsam/platform_deps.h → platforms/arm_atsam/platform_deps.h b/tmk_core/common/arm_atsam/platform_deps.h → platforms/arm_atsam/platform_deps.h
diff --git a/tmk_core/common/arm_atsam/suspend.c → platforms/arm_atsam/suspend.c b/tmk_core/common/arm_atsam/suspend.c → platforms/arm_atsam/suspend.c
diff --git a/tmk_core/common/arm_atsam/timer.c → platforms/arm_atsam/timer.c b/tmk_core/common/arm_atsam/timer.c → platforms/arm_atsam/timer.c
diff --git a/tmk_core/common/atomic_util.h → platforms/atomic_util.h b/tmk_core/common/atomic_util.h → platforms/atomic_util.h
diff --git a/tmk_core/common/avr/_print.h → platforms/avr/_print.h b/tmk_core/common/avr/_print.h → platforms/avr/_print.h
diff --git a/tmk_core/common/avr/_timer.h → platforms/avr/_timer.h b/tmk_core/common/avr/_timer.h → platforms/avr/_timer.h
diff --git a/tmk_core/common/avr/_wait.h → platforms/avr/_wait.h b/tmk_core/common/avr/_wait.h → platforms/avr/_wait.h
diff --git a/tmk_core/common/avr/atomic_util.h → platforms/avr/atomic_util.h b/tmk_core/common/avr/atomic_util.h → platforms/avr/atomic_util.h
diff --git a/tmk_core/common/avr/bootloader.c → platforms/avr/bootloader.c b/tmk_core/common/avr/bootloader.c → platforms/avr/bootloader.c
diff --git a/tmk_core/common/avr/bootloader_size.c → platforms/avr/bootloader_size.c b/tmk_core/common/avr/bootloader_size.c → platforms/avr/bootloader_size.c
diff --git a/tmk_core/common/avr/gpio.h → platforms/avr/gpio.h b/tmk_core/common/avr/gpio.h → platforms/avr/gpio.h
diff --git a/tmk_core/common/avr/pin_defs.h → platforms/avr/pin_defs.h b/tmk_core/common/avr/pin_defs.h → platforms/avr/pin_defs.h
diff --git a/tmk_core/common/avr/platform.c → platforms/avr/platform.c b/tmk_core/common/avr/platform.c → platforms/avr/platform.c
diff --git a/tmk_core/avr.mk → platforms/avr/platform.mk b/tmk_core/avr.mk → platforms/avr/platform.mk
diff --git a/tmk_core/common/avr/platform_deps.h → platforms/avr/platform_deps.h b/tmk_core/common/avr/platform_deps.h → platforms/avr/platform_deps.h
diff --git a/tmk_core/common/avr/printf.c → platforms/avr/printf.c b/tmk_core/common/avr/printf.c → platforms/avr/printf.c
diff --git a/tmk_core/common/avr/printf.mk → platforms/avr/printf.mk b/tmk_core/common/avr/printf.mk → platforms/avr/printf.mk
diff --git a/tmk_core/common/avr/sleep_led.c → platforms/avr/sleep_led.c b/tmk_core/common/avr/sleep_led.c → platforms/avr/sleep_led.c
diff --git a/tmk_core/common/avr/suspend.c → platforms/avr/suspend.c b/tmk_core/common/avr/suspend.c → platforms/avr/suspend.c
diff --git a/tmk_core/common/avr/timer.c → platforms/avr/timer.c b/tmk_core/common/avr/timer.c → platforms/avr/timer.c
diff --git a/tmk_core/common/avr/timer_avr.h → platforms/avr/timer_avr.h b/tmk_core/common/avr/timer_avr.h → platforms/avr/timer_avr.h
diff --git a/tmk_core/common/avr/xprintf.S → platforms/avr/xprintf.S b/tmk_core/common/avr/xprintf.S → platforms/avr/xprintf.S
diff --git a/tmk_core/common/avr/xprintf.h → platforms/avr/xprintf.h b/tmk_core/common/avr/xprintf.h → platforms/avr/xprintf.h
diff --git a/tmk_core/common/bootloader.h → platforms/bootloader.h b/tmk_core/common/bootloader.h → platforms/bootloader.h
diff --git a/tmk_core/common/chibios/_timer.h → platforms/chibios/_timer.h b/tmk_core/common/chibios/_timer.h → platforms/chibios/_timer.h
diff --git a/tmk_core/common/chibios/_wait.c → platforms/chibios/_wait.c b/tmk_core/common/chibios/_wait.c → platforms/chibios/_wait.c
diff --git a/tmk_core/common/chibios/_wait.h → platforms/chibios/_wait.h b/tmk_core/common/chibios/_wait.h → platforms/chibios/_wait.h
diff --git a/tmk_core/common/chibios/atomic_util.h → platforms/chibios/atomic_util.h b/tmk_core/common/chibios/atomic_util.h → platforms/chibios/atomic_util.h
diff --git a/tmk_core/common/chibios/bootloader.c → platforms/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c → platforms/chibios/bootloader.c
diff --git a/tmk_core/common/chibios/chibios_config.h → platforms/chibios/chibios_config.h b/tmk_core/common/chibios/chibios_config.h → platforms/chibios/chibios_config.h
diff --git a/tmk_core/common/chibios/eeprom_stm32.c → platforms/chibios/eeprom_stm32.c b/tmk_core/common/chibios/eeprom_stm32.c → platforms/chibios/eeprom_stm32.c
diff --git a/tmk_core/common/chibios/eeprom_stm32.h → platforms/chibios/eeprom_stm32.h b/tmk_core/common/chibios/eeprom_stm32.h → platforms/chibios/eeprom_stm32.h
diff --git a/tmk_core/common/chibios/eeprom_stm32_defs.h → platforms/chibios/eeprom_stm32_defs.h b/tmk_core/common/chibios/eeprom_stm32_defs.h → platforms/chibios/eeprom_stm32_defs.h
diff --git a/tmk_core/common/chibios/eeprom_teensy.c → platforms/chibios/eeprom_teensy.c b/tmk_core/common/chibios/eeprom_teensy.c → platforms/chibios/eeprom_teensy.c
diff --git a/tmk_core/common/chibios/flash_stm32.c → platforms/chibios/flash_stm32.c b/tmk_core/common/chibios/flash_stm32.c → platforms/chibios/flash_stm32.c
diff --git a/tmk_core/common/chibios/flash_stm32.h → platforms/chibios/flash_stm32.h b/tmk_core/common/chibios/flash_stm32.h → platforms/chibios/flash_stm32.h
diff --git a/...core/common/chibios/gd32v_compatibility.h → platforms/chibios/gd32v_compatibility.h b/...core/common/chibios/gd32v_compatibility.h → platforms/chibios/gd32v_compatibility.h
diff --git a/tmk_core/common/chibios/gpio.h → platforms/chibios/gpio.h b/tmk_core/common/chibios/gpio.h → platforms/chibios/gpio.h
diff --git a/tmk_core/common/chibios/pin_defs.h → platforms/chibios/pin_defs.h b/tmk_core/common/chibios/pin_defs.h → platforms/chibios/pin_defs.h
diff --git a/tmk_core/common/chibios/platform.c → platforms/chibios/platform.c b/tmk_core/common/chibios/platform.c → platforms/chibios/platform.c
diff --git a/tmk_core/chibios.mk → platforms/chibios/platform.mk b/tmk_core/chibios.mk → platforms/chibios/platform.mk
diff --git a/tmk_core/common/chibios/platform_deps.h → platforms/chibios/platform_deps.h b/tmk_core/common/chibios/platform_deps.h → platforms/chibios/platform_deps.h
diff --git a/tmk_core/common/chibios/sleep_led.c → platforms/chibios/sleep_led.c b/tmk_core/common/chibios/sleep_led.c → platforms/chibios/sleep_led.c
diff --git a/tmk_core/common/chibios/suspend.c → platforms/chibios/suspend.c b/tmk_core/common/chibios/suspend.c → platforms/chibios/suspend.c
diff --git a/tmk_core/common/chibios/syscall-fallbacks.c → platforms/chibios/syscall-fallbacks.c b/tmk_core/common/chibios/syscall-fallbacks.c → platforms/chibios/syscall-fallbacks.c
diff --git a/tmk_core/common/chibios/timer.c → platforms/chibios/timer.c b/tmk_core/common/chibios/timer.c → platforms/chibios/timer.c
diff --git a/tmk_core/common/chibios/wait.c → platforms/chibios/wait.c b/tmk_core/common/chibios/wait.c → platforms/chibios/wait.c
diff --git a/platforms/common.mk b/platforms/common.mk
@@ -0,0 +1,12 @@
+PLATFORM_COMMON_DIR = $(PLATFORM_PATH)/$(PLATFORM_KEY)
+
+TMK_COMMON_SRC +=	\
+	$(PLATFORM_COMMON_DIR)/platform.c \
+	$(PLATFORM_COMMON_DIR)/suspend.c \
+	$(PLATFORM_COMMON_DIR)/timer.c \
+	$(PLATFORM_COMMON_DIR)/bootloader.c \
+
+# Search Path
+VPATH += $(PLATFORM_PATH)
+VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)
+VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)
diff --git a/tmk_core/common/eeprom.h → platforms/eeprom.h b/tmk_core/common/eeprom.h → platforms/eeprom.h
diff --git a/tmk_core/common/gpio.h → platforms/gpio.h b/tmk_core/common/gpio.h → platforms/gpio.h
diff --git a/tmk_core/common/pin_defs.h → platforms/pin_defs.h b/tmk_core/common/pin_defs.h → platforms/pin_defs.h
diff --git a/tmk_core/common/progmem.h → platforms/progmem.h b/tmk_core/common/progmem.h → platforms/progmem.h
diff --git a/tmk_core/common/sleep_led.h → platforms/sleep_led.h b/tmk_core/common/sleep_led.h → platforms/sleep_led.h
diff --git a/tmk_core/common/suspend.h → platforms/suspend.h b/tmk_core/common/suspend.h → platforms/suspend.h
diff --git a/tmk_core/common/test/_wait.h → platforms/test/_wait.h b/tmk_core/common/test/_wait.h → platforms/test/_wait.h
diff --git a/tmk_core/common/test/bootloader.c → platforms/test/bootloader.c b/tmk_core/common/test/bootloader.c → platforms/test/bootloader.c
diff --git a/tmk_core/common/test/eeprom.c → platforms/test/eeprom.c b/tmk_core/common/test/eeprom.c → platforms/test/eeprom.c
diff --git a/tmk_core/common/test/eeprom_stm32_tests.cpp → platforms/test/eeprom_stm32_tests.cpp b/tmk_core/common/test/eeprom_stm32_tests.cpp → platforms/test/eeprom_stm32_tests.cpp
diff --git a/tmk_core/common/test/flash_stm32_mock.c → platforms/test/flash_stm32_mock.c b/tmk_core/common/test/flash_stm32_mock.c → platforms/test/flash_stm32_mock.c
diff --git a/tmk_core/common/test/hal.h → platforms/test/hal.h b/tmk_core/common/test/hal.h → platforms/test/hal.h
diff --git a/tmk_core/common/test/platform.c → platforms/test/platform.c b/tmk_core/common/test/platform.c → platforms/test/platform.c
diff --git a/tmk_core/common/test/platform.h → platforms/test/platform.h b/tmk_core/common/test/platform.h → platforms/test/platform.h
diff --git a/tmk_core/native.mk → platforms/test/platform.mk b/tmk_core/native.mk → platforms/test/platform.mk
diff --git a/tmk_core/common/test/platform_deps.h → platforms/test/platform_deps.h b/tmk_core/common/test/platform_deps.h → platforms/test/platform_deps.h
diff --git a/tmk_core/common/test/rules.mk → platforms/test/rules.mk b/tmk_core/common/test/rules.mk → platforms/test/rules.mk
@@ -11,14 +11,14 @@ eeprom_stm32_large_DEFS := $(eeprom_stm32_DEFS) \
 	-DFEE_PAGE_COUNT=16
 
 eeprom_stm32_INC := \
-	$(TMK_PATH)/common/chibios/
+	$(PLATFORM_PATH)/chibios/
 eeprom_stm32_tiny_INC := $(eeprom_stm32_INC)
 eeprom_stm32_large_INC := $(eeprom_stm32_INC)
 
 eeprom_stm32_SRC := \
 	$(TOP_DIR)/drivers/eeprom/eeprom_driver.c \
-	$(TMK_PATH)/common/test/eeprom_stm32_tests.cpp \
-	$(TMK_PATH)/common/test/flash_stm32_mock.c \
-	$(TMK_PATH)/common/chibios/eeprom_stm32.c
+	$(PLATFORM_PATH)/$(PLATFORM_KEY)/eeprom_stm32_tests.cpp \
+	$(PLATFORM_PATH)/$(PLATFORM_KEY)/flash_stm32_mock.c \
+	$(PLATFORM_PATH)/chibios/eeprom_stm32.c
 eeprom_stm32_tiny_SRC := $(eeprom_stm32_SRC)
 eeprom_stm32_large_SRC := $(eeprom_stm32_SRC)
diff --git a/tmk_core/common/test/suspend.c → platforms/test/suspend.c b/tmk_core/common/test/suspend.c → platforms/test/suspend.c
diff --git a/tmk_core/common/test/testlist.mk → platforms/test/testlist.mk b/tmk_core/common/test/testlist.mk → platforms/test/testlist.mk
diff --git a/tmk_core/common/test/timer.c → platforms/test/timer.c b/tmk_core/common/test/timer.c → platforms/test/timer.c
diff --git a/tmk_core/common/timer.h → platforms/timer.h b/tmk_core/common/timer.h → platforms/timer.h
diff --git a/tmk_core/common/wait.h → platforms/wait.h b/tmk_core/common/wait.h → platforms/wait.h
diff --git a/quantum/debounce/tests/rules.mk b/quantum/debounce/tests/rules.mk
@@ -16,7 +16,7 @@
 DEBOUNCE_COMMON_DEFS := -DMATRIX_ROWS=4 -DMATRIX_COLS=10 -DDEBOUNCE=5
 
 DEBOUNCE_COMMON_SRC := $(QUANTUM_PATH)/debounce/tests/debounce_test_common.cpp \
-	$(TMK_PATH)/common/test/timer.c
+	$(PLATFORM_PATH)/$(PLATFORM_KEY)/timer.c
 
 debounce_sym_defer_g_DEFS := $(DEBOUNCE_COMMON_DEFS)
 debounce_sym_defer_g_SRC := $(DEBOUNCE_COMMON_SRC) \

diff --git a/quantum/sequencer/tests/rules.mk b/quantum/sequencer/tests/rules.mk
@@ -8,4 +8,4 @@ sequencer_SRC := \
 	$(QUANTUM_PATH)/sequencer/tests/midi_mock.c \
 	$(QUANTUM_PATH)/sequencer/tests/sequencer_tests.cpp \
 	$(QUANTUM_PATH)/sequencer/sequencer.c \
-	$(TMK_PATH)/common/test/timer.c
+	$(PLATFORM_PATH)/$(PLATFORM_KEY)/timer.c
diff --git a/testlist.mk b/testlist.mk
@@ -1,9 +1,9 @@
 TEST_LIST = $(notdir $(patsubst %/rules.mk,%,$(wildcard $(ROOT_DIR)/tests/*/rules.mk)))
 FULL_TESTS := $(TEST_LIST)
 
-include $(ROOT_DIR)/quantum/debounce/tests/testlist.mk
-include $(ROOT_DIR)/quantum/sequencer/tests/testlist.mk
-include $(ROOT_DIR)/tmk_core/common/test/testlist.mk
+include $(QUANTUM_PATH)/debounce/tests/testlist.mk
+include $(QUANTUM_PATH)/sequencer/tests/testlist.mk
+include $(PLATFORM_PATH)/test/testlist.mk
 
 define VALIDATE_TEST_LIST
     ifneq ($1,)

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
@@ -1,5 +1,3 @@
-PROTOCOL_DIR = protocol
-
 TMK_COMMON_SRC +=	\
 	$(PROTOCOL_DIR)/host.c \
 	$(PROTOCOL_DIR)/report.c \