qmk · zvecr · Aug 17, 2021 · Aug 5, 2021 · Aug 6, 2021 · Aug 6, 2021
diff --git 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
@@ -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 → platforms/avr/drivers/analog.c b/drivers/avr/analog.c → platforms/avr/drivers/analog.c
diff --git a/drivers/avr/analog.h → platforms/avr/drivers/analog.h b/drivers/avr/analog.h → platforms/avr/drivers/analog.h
diff --git a/drivers/avr/glcdfont.c → platforms/avr/drivers/glcdfont.c b/drivers/avr/glcdfont.c → platforms/avr/drivers/glcdfont.c
diff --git a/drivers/avr/hd44780.c → platforms/avr/drivers/hd44780.c b/drivers/avr/hd44780.c → platforms/avr/drivers/hd44780.c
diff --git a/drivers/avr/hd44780.h → platforms/avr/drivers/hd44780.h b/drivers/avr/hd44780.h → platforms/avr/drivers/hd44780.h
diff --git a/drivers/avr/i2c_master.c → platforms/avr/drivers/i2c_master.c b/drivers/avr/i2c_master.c → platforms/avr/drivers/i2c_master.c
diff --git a/drivers/avr/i2c_master.h → platforms/avr/drivers/i2c_master.h b/drivers/avr/i2c_master.h → platforms/avr/drivers/i2c_master.h
diff --git a/drivers/avr/i2c_slave.c → platforms/avr/drivers/i2c_slave.c b/drivers/avr/i2c_slave.c → platforms/avr/drivers/i2c_slave.c
diff --git a/drivers/avr/i2c_slave.h → platforms/avr/drivers/i2c_slave.h b/drivers/avr/i2c_slave.h → platforms/avr/drivers/i2c_slave.h
diff --git a/drivers/avr/serial.c → platforms/avr/drivers/serial.c b/drivers/avr/serial.c → platforms/avr/drivers/serial.c
diff --git a/drivers/avr/spi_master.c → platforms/avr/drivers/spi_master.c b/drivers/avr/spi_master.c → platforms/avr/drivers/spi_master.c
diff --git a/drivers/avr/spi_master.h → platforms/avr/drivers/spi_master.h b/drivers/avr/spi_master.h → platforms/avr/drivers/spi_master.h
diff --git a/drivers/avr/ssd1306.c → platforms/avr/drivers/ssd1306.c b/drivers/avr/ssd1306.c → platforms/avr/drivers/ssd1306.c
diff --git a/drivers/avr/ssd1306.h → platforms/avr/drivers/ssd1306.h b/drivers/avr/ssd1306.h → platforms/avr/drivers/ssd1306.h
diff --git a/drivers/avr/uart.c → platforms/avr/drivers/uart.c b/drivers/avr/uart.c → platforms/avr/drivers/uart.c
diff --git a/drivers/avr/uart.h → platforms/avr/drivers/uart.h b/drivers/avr/uart.h → platforms/avr/drivers/uart.h
diff --git a/drivers/avr/ws2812.c → platforms/avr/drivers/ws2812.c b/drivers/avr/ws2812.c → platforms/avr/drivers/ws2812.c
diff --git a/drivers/avr/ws2812_i2c.c → platforms/avr/drivers/ws2812_i2c.c b/drivers/avr/ws2812_i2c.c → platforms/avr/drivers/ws2812_i2c.c
diff --git a/drivers/chibios/analog.c → platforms/chibios/drivers/analog.c b/drivers/chibios/analog.c → platforms/chibios/drivers/analog.c
diff --git a/drivers/chibios/analog.h → platforms/chibios/drivers/analog.h b/drivers/chibios/analog.h → platforms/chibios/drivers/analog.h
diff --git a/drivers/eeprom/eeprom_stm32_L0_L1.c → ...ibios/drivers/eeprom/eeprom_stm32_L0_L1.c b/drivers/eeprom/eeprom_stm32_L0_L1.c → ...ibios/drivers/eeprom/eeprom_stm32_L0_L1.c
diff --git a/drivers/eeprom/eeprom_stm32_L0_L1.h → ...ibios/drivers/eeprom/eeprom_stm32_L0_L1.h b/drivers/eeprom/eeprom_stm32_L0_L1.h → ...ibios/drivers/eeprom/eeprom_stm32_L0_L1.h
diff --git a/drivers/chibios/i2c_master.c → platforms/chibios/drivers/i2c_master.c b/drivers/chibios/i2c_master.c → platforms/chibios/drivers/i2c_master.c
diff --git a/drivers/chibios/i2c_master.h → platforms/chibios/drivers/i2c_master.h b/drivers/chibios/i2c_master.h → platforms/chibios/drivers/i2c_master.h
diff --git a/drivers/chibios/serial.c → platforms/chibios/drivers/serial.c b/drivers/chibios/serial.c → platforms/chibios/drivers/serial.c
diff --git a/drivers/chibios/serial_usart.c → platforms/chibios/drivers/serial_usart.c b/drivers/chibios/serial_usart.c → platforms/chibios/drivers/serial_usart.c
diff --git a/drivers/chibios/serial_usart.h → platforms/chibios/drivers/serial_usart.h b/drivers/chibios/serial_usart.h → platforms/chibios/drivers/serial_usart.h
diff --git a/drivers/chibios/spi_master.c → platforms/chibios/drivers/spi_master.c b/drivers/chibios/spi_master.c → platforms/chibios/drivers/spi_master.c
diff --git a/drivers/chibios/spi_master.h → platforms/chibios/drivers/spi_master.h b/drivers/chibios/spi_master.h → platforms/chibios/drivers/spi_master.h
diff --git a/drivers/chibios/uart.c → platforms/chibios/drivers/uart.c b/drivers/chibios/uart.c → platforms/chibios/drivers/uart.c
diff --git a/drivers/chibios/uart.h → platforms/chibios/drivers/uart.h b/drivers/chibios/uart.h → platforms/chibios/drivers/uart.h
diff --git a/drivers/chibios/usbpd_stm32g4.c → platforms/chibios/drivers/usbpd_stm32g4.c b/drivers/chibios/usbpd_stm32g4.c → platforms/chibios/drivers/usbpd_stm32g4.c
diff --git a/drivers/chibios/ws2812.c → platforms/chibios/drivers/ws2812.c b/drivers/chibios/ws2812.c → platforms/chibios/drivers/ws2812.c
diff --git a/drivers/chibios/ws2812_pwm.c → platforms/chibios/drivers/ws2812_pwm.c b/drivers/chibios/ws2812_pwm.c → platforms/chibios/drivers/ws2812_pwm.c
diff --git a/drivers/chibios/ws2812_spi.c → platforms/chibios/drivers/ws2812_spi.c b/drivers/chibios/ws2812_spi.c → platforms/chibios/drivers/ws2812_spi.c
diff --git 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
@@ -277,8 +277,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
@@ -128,3 +128,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
@@ -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)