41 files changed, 5 insertions, 5 deletions

diff --git a/common.mk b/common.mk
index c13b5e276..8acea3937 100644
--- a/common.mk
+++ b/common.mk
@@ -12,6 +12,9 @@ QUANTUM_PATH = $(QUANTUM_DIR)
 DRIVER_DIR = drivers
 DRIVER_PATH = $(DRIVER_DIR)
 
+PLATFORM_DIR = platforms
+PLATFORM_PATH = $(PLATFORM_DIR)
+
 BUILD_DIR := .build
 
 COMMON_VPATH := $(TOP_DIR)
diff --git a/common_features.mk b/common_features.mk
index 493aab635..1eece0242 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -178,6 +178,7 @@ else
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
         OPT_DEFS += -DEEPROM_DRIVER
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
+        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
         SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
       else
         # This will effectively work the same as "transient" if not supported by the chip
diff --git a/drivers/avr/analog.c b/platforms/avr/drivers/analog.c
index 8d299ffdb..8d299ffdb 100644
--- a/drivers/avr/analog.c
+++ b/platforms/avr/drivers/analog.c
diff --git a/drivers/avr/analog.h b/platforms/avr/drivers/analog.h
index 058882450..058882450 100644
--- a/drivers/avr/analog.h
+++ b/platforms/avr/drivers/analog.h
diff --git a/drivers/avr/glcdfont.c b/platforms/avr/drivers/glcdfont.c
index 5e763b054..5e763b054 100644
--- a/drivers/avr/glcdfont.c
+++ b/platforms/avr/drivers/glcdfont.c
diff --git a/drivers/avr/hd44780.c b/platforms/avr/drivers/hd44780.c
index f71069dec..f71069dec 100644
--- a/drivers/avr/hd44780.c
+++ b/platforms/avr/drivers/hd44780.c
diff --git a/drivers/avr/hd44780.h b/platforms/avr/drivers/hd44780.h
index 08e60f8a4..08e60f8a4 100644
--- a/drivers/avr/hd44780.h
+++ b/platforms/avr/drivers/hd44780.h
diff --git a/drivers/avr/i2c_master.c b/platforms/avr/drivers/i2c_master.c
index 2773e0077..2773e0077 100644
--- a/drivers/avr/i2c_master.c
+++ b/platforms/avr/drivers/i2c_master.c
diff --git a/drivers/avr/i2c_master.h b/platforms/avr/drivers/i2c_master.h
index e5af73364..e5af73364 100644
--- a/drivers/avr/i2c_master.h
+++ b/platforms/avr/drivers/i2c_master.h
diff --git a/drivers/avr/i2c_slave.c b/platforms/avr/drivers/i2c_slave.c
index 2907f164c..2907f164c 100644
--- a/drivers/avr/i2c_slave.c
+++ b/platforms/avr/drivers/i2c_slave.c
diff --git a/drivers/avr/i2c_slave.h b/platforms/avr/drivers/i2c_slave.h
index a8647c9da..a8647c9da 100644
--- a/drivers/avr/i2c_slave.h
+++ b/platforms/avr/drivers/i2c_slave.h
diff --git a/drivers/avr/serial.c b/platforms/avr/drivers/serial.c
index 9a7345a53..9a7345a53 100644
--- a/drivers/avr/serial.c
+++ b/platforms/avr/drivers/serial.c
diff --git a/drivers/avr/spi_master.c b/platforms/avr/drivers/spi_master.c
index 4e8fd3bcd..4e8fd3bcd 100644
--- a/drivers/avr/spi_master.c
+++ b/platforms/avr/drivers/spi_master.c
diff --git a/drivers/avr/spi_master.h b/platforms/avr/drivers/spi_master.h
index 8a30f47ae..8a30f47ae 100644
--- a/drivers/avr/spi_master.h
+++ b/platforms/avr/drivers/spi_master.h
diff --git a/drivers/avr/ssd1306.c b/platforms/avr/drivers/ssd1306.c
index 1a09a2bcb..1a09a2bcb 100644
--- a/drivers/avr/ssd1306.c
+++ b/platforms/avr/drivers/ssd1306.c
diff --git a/drivers/avr/ssd1306.h b/platforms/avr/drivers/ssd1306.h
index 6eecdcfaa..6eecdcfaa 100644
--- a/drivers/avr/ssd1306.h
+++ b/platforms/avr/drivers/ssd1306.h
diff --git a/drivers/avr/uart.c b/platforms/avr/drivers/uart.c
index c6abcb6fe..c6abcb6fe 100644
--- a/drivers/avr/uart.c
+++ b/platforms/avr/drivers/uart.c
diff --git a/drivers/avr/uart.h b/platforms/avr/drivers/uart.h
index 602eb3d8b..602eb3d8b 100644
--- a/drivers/avr/uart.h
+++ b/platforms/avr/drivers/uart.h
diff --git a/drivers/avr/ws2812.c b/platforms/avr/drivers/ws2812.c
index 77c492cd4..77c492cd4 100644
--- a/drivers/avr/ws2812.c
+++ b/platforms/avr/drivers/ws2812.c
diff --git a/drivers/avr/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c
index 1c332e24b..1c332e24b 100644
--- a/drivers/avr/ws2812_i2c.c
+++ b/platforms/avr/drivers/ws2812_i2c.c
diff --git a/drivers/chibios/analog.c b/platforms/chibios/drivers/analog.c
index 8c476fcac..8c476fcac 100644
--- a/drivers/chibios/analog.c
+++ b/platforms/chibios/drivers/analog.c
diff --git a/drivers/chibios/analog.h b/platforms/chibios/drivers/analog.h
index e61c39426..e61c39426 100644
--- a/drivers/chibios/analog.h
+++ b/platforms/chibios/drivers/analog.h
diff --git a/drivers/eeprom/eeprom_stm32_L0_L1.c b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.c
index ed26cc714..ed26cc714 100644
--- a/drivers/eeprom/eeprom_stm32_L0_L1.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.c
diff --git a/drivers/eeprom/eeprom_stm32_L0_L1.h b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
index a35defca8..a35defca8 100644
--- a/drivers/eeprom/eeprom_stm32_L0_L1.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
diff --git a/drivers/chibios/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index fc4bb2ab3..fc4bb2ab3 100644
--- a/drivers/chibios/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
diff --git a/drivers/chibios/i2c_master.h b/platforms/chibios/drivers/i2c_master.h
index c68109acb..c68109acb 100644
--- a/drivers/chibios/i2c_master.h
+++ b/platforms/chibios/drivers/i2c_master.h
diff --git a/drivers/chibios/serial.c b/platforms/chibios/drivers/serial.c
index f54fbcee4..f54fbcee4 100644
--- a/drivers/chibios/serial.c
+++ b/platforms/chibios/drivers/serial.c
diff --git a/drivers/chibios/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index ea4473791..ea4473791 100644
--- a/drivers/chibios/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
diff --git a/drivers/chibios/serial_usart.h b/platforms/chibios/drivers/serial_usart.h
index c64e15566..c64e15566 100644
--- a/drivers/chibios/serial_usart.h
+++ b/platforms/chibios/drivers/serial_usart.h
diff --git a/drivers/chibios/spi_master.c b/platforms/chibios/drivers/spi_master.c
index 28ddcbb2b..28ddcbb2b 100644
--- a/drivers/chibios/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
diff --git a/drivers/chibios/spi_master.h b/platforms/chibios/drivers/spi_master.h
index b5a6ef143..b5a6ef143 100644
--- a/drivers/chibios/spi_master.h
+++ b/platforms/chibios/drivers/spi_master.h
diff --git a/drivers/chibios/uart.c b/platforms/chibios/drivers/uart.c
index 030335b34..030335b34 100644
--- a/drivers/chibios/uart.c
+++ b/platforms/chibios/drivers/uart.c
diff --git a/drivers/chibios/uart.h b/platforms/chibios/drivers/uart.h
index b4e20e9fd..b4e20e9fd 100644
--- a/drivers/chibios/uart.h
+++ b/platforms/chibios/drivers/uart.h
diff --git a/drivers/chibios/usbpd_stm32g4.c b/platforms/chibios/drivers/usbpd_stm32g4.c
index f16ca8aea..f16ca8aea 100644
--- a/drivers/chibios/usbpd_stm32g4.c
+++ b/platforms/chibios/drivers/usbpd_stm32g4.c
diff --git a/drivers/chibios/ws2812.c b/platforms/chibios/drivers/ws2812.c
index 0d12e2fb7..0d12e2fb7 100644
--- a/drivers/chibios/ws2812.c
+++ b/platforms/chibios/drivers/ws2812.c
diff --git a/drivers/chibios/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index e6af55b6b..e6af55b6b 100644
--- a/drivers/chibios/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
diff --git a/drivers/chibios/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index 377a929b9..377a929b9 100644
--- a/drivers/chibios/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
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
 EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
 BIN =
 
-COMMON_VPATH += $(DRIVER_PATH)/avr
-
 COMPILEFLAGS += -funsigned-char
 COMPILEFLAGS += -funsigned-bitfields
 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)
 EEP =
 BIN = $(OBJCOPY) -O binary
 
-COMMON_VPATH += $(DRIVER_PATH)/chibios
-
 THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB
 
 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
 # Search Path
 VPATH += $(TMK_PATH)/$(COMMON_DIR)
 VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR)
+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
 # Search Path
 VPATH += $(TMK_PATH)/$(LUFA_DIR)
 VPATH += $(LUFA_PATH)
-VPATH += $(DRIVER_PATH)/avr
 
 # Option modules
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)