diff options
author | Joel Challis <git@zvecr.com> | 2021-08-17 23:43:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-17 23:43:09 +0100 |
commit | 1bb7af4d446174b7181c9bb22dbd14c93642ea10 (patch) | |
tree | 894eceeb29cc2c00f6b0f08a4ca177da7f172424 | |
parent | 483691dd73e5260fac958c524e0a12e705db43f6 (diff) | |
download | qmk_firmware-1bb7af4d446174b7181c9bb22dbd14c93642ea10.tar.gz qmk_firmware-1bb7af4d446174b7181c9bb22dbd14c93642ea10.zip |
Relocate platform specific drivers (#13894)
* Relocate platform specific drivers
* Move stm eeprom
* Tidy up slightly
-rw-r--r-- | common.mk | 3 | ||||
-rw-r--r-- | common_features.mk | 1 | ||||
-rw-r--r-- | platforms/avr/drivers/analog.c (renamed from drivers/avr/analog.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/analog.h (renamed from drivers/avr/analog.h) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/glcdfont.c (renamed from drivers/avr/glcdfont.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/hd44780.c (renamed from drivers/avr/hd44780.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/hd44780.h (renamed from drivers/avr/hd44780.h) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/i2c_master.c (renamed from drivers/avr/i2c_master.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/i2c_master.h (renamed from drivers/avr/i2c_master.h) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/i2c_slave.c (renamed from drivers/avr/i2c_slave.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/i2c_slave.h (renamed from drivers/avr/i2c_slave.h) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/serial.c (renamed from drivers/avr/serial.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/spi_master.c (renamed from drivers/avr/spi_master.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/spi_master.h (renamed from drivers/avr/spi_master.h) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/ssd1306.c (renamed from drivers/avr/ssd1306.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/ssd1306.h (renamed from drivers/avr/ssd1306.h) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/uart.c (renamed from drivers/avr/uart.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/uart.h (renamed from drivers/avr/uart.h) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/ws2812.c (renamed from drivers/avr/ws2812.c) | 0 | ||||
-rw-r--r-- | platforms/avr/drivers/ws2812_i2c.c (renamed from drivers/avr/ws2812_i2c.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/analog.c (renamed from drivers/chibios/analog.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/analog.h (renamed from drivers/chibios/analog.h) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.c (renamed from drivers/eeprom/eeprom_stm32_L0_L1.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h (renamed from drivers/eeprom/eeprom_stm32_L0_L1.h) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/i2c_master.c (renamed from drivers/chibios/i2c_master.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/i2c_master.h (renamed from drivers/chibios/i2c_master.h) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/serial.c (renamed from drivers/chibios/serial.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/serial_usart.c (renamed from drivers/chibios/serial_usart.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/serial_usart.h (renamed from drivers/chibios/serial_usart.h) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/spi_master.c (renamed from drivers/chibios/spi_master.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/spi_master.h (renamed from drivers/chibios/spi_master.h) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/uart.c (renamed from drivers/chibios/uart.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/uart.h (renamed from drivers/chibios/uart.h) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/usbpd_stm32g4.c (renamed from drivers/chibios/usbpd_stm32g4.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/ws2812.c (renamed from drivers/chibios/ws2812.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/ws2812_pwm.c (renamed from drivers/chibios/ws2812_pwm.c) | 0 | ||||
-rw-r--r-- | platforms/chibios/drivers/ws2812_spi.c (renamed from drivers/chibios/ws2812_spi.c) | 0 | ||||
-rw-r--r-- | tmk_core/avr.mk | 2 | ||||
-rw-r--r-- | tmk_core/chibios.mk | 2 | ||||
-rw-r--r-- | tmk_core/common.mk | 1 | ||||
-rw-r--r-- | tmk_core/protocol/lufa.mk | 1 |
41 files changed, 5 insertions, 5 deletions
@@ -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 493aab6353..1eece0242e 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 8d299ffdb9..8d299ffdb9 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 058882450d..058882450d 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 5e763b054f..5e763b054f 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 f71069dece..f71069dece 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 08e60f8a44..08e60f8a44 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 2773e00778..2773e00778 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 e5af73364b..e5af73364b 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 2907f164c0..2907f164c0 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 a8647c9da3..a8647c9da3 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 9a7345a53d..9a7345a53d 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 4e8fd3bcdf..4e8fd3bcdf 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 8a30f47ae4..8a30f47ae4 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 1a09a2bcb7..1a09a2bcb7 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 6eecdcfaa4..6eecdcfaa4 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 c6abcb6fe0..c6abcb6fe0 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 602eb3d8b0..602eb3d8b0 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 77c492cd4c..77c492cd4c 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 1c332e24b6..1c332e24b6 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 8c476fcac2..8c476fcac2 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 e61c394265..e61c394265 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 ed26cc7145..ed26cc7145 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 a35defca8b..a35defca8b 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 fc4bb2ab37..fc4bb2ab37 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 c68109acbd..c68109acbd 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 f54fbcee4e..f54fbcee4e 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 ea4473791c..ea4473791c 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 c64e15566f..c64e15566f 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 28ddcbb2ba..28ddcbb2ba 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 b5a6ef1437..b5a6ef1437 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 030335b342..030335b342 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 b4e20e9fd3..b4e20e9fd3 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 f16ca8aeae..f16ca8aeae 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 0d12e2fb79..0d12e2fb79 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 e6af55b6b3..e6af55b6b3 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 377a929b94..377a929b94 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 d7bee6d34c..940e95397b 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 cbd9fff692..28aaaecba0 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 fa907b47b8..923a736d35 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 514d5fac41..c8935dacb7 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) |