37 files changed, 49 insertions, 49 deletions
diff --git a/boards/base/Embest-STM32-DMSTF4BB/board.mk b/boards/base/Embest-STM32-DMSTF4BB/board.mk
index 3795b43d..9deacc08 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/board.mk
+++ b/boards/base/Embest-STM32-DMSTF4BB/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/SSD2119/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/STMPE811/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/SSD2119/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk
 
diff --git a/boards/base/FireBull-STM32F103-FB/board.mk b/boards/base/FireBull-STM32F103-FB/board.mk
index 8f3e43c0..11714dc7 100644
--- a/boards/base/FireBull-STM32F103-FB/board.mk
+++ b/boards/base/FireBull-STM32F103-FB/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/FireBull-STM32F103-FB/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/ADS7843/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/ADS7843/driver.mk
 
diff --git a/boards/base/Linux/board.mk b/boards/base/Linux/board.mk
index 8c480766..4334c2fc 100644
--- a/boards/base/Linux/board.mk
+++ b/boards/base/Linux/board.mk
@@ -2,5 +2,5 @@ GFXINC  += $(GFXLIB)/boards/base/Linux
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
 
-include $(GFXLIB)/drivers/multiple/X/gdisp_lld.mk
+include $(GFXLIB)/drivers/multiple/X/driver.mk
 
diff --git a/boards/base/Marlin/board.mk b/boards/base/Marlin/board.mk
index 14e8132d..ac3d55f1 100644
--- a/boards/base/Marlin/board.mk
+++ b/boards/base/Marlin/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/Marlin/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/RA8875/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/FT5x06/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/RA8875/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/FT5x06/driver.mk
 
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
index b18bf8f5..0f472bcc 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
-include $(GFXLIB)/drivers/gdisp/ILI9341/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/ILI9341/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
 include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board.mk b/boards/base/Olimex-SAM7EX256-GE12/board.mk
index 2ef53142..ec712c18 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE12/board.mk
@@ -1,8 +1,8 @@
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE12 $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
-include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk
-include $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.mk
-include $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld.mk
-include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/driver.mk
+include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
+include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
+include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk
 include $(GFXLIB)/drivers/gaudio/gadc/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board.mk b/boards/base/Olimex-SAM7EX256-GE8/board.mk
index 98119565..031bbe61 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE8/board.mk
@@ -1,9 +1,9 @@
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
-include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
-include $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.mk
-include $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld.mk
-include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/driver.mk
+include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
+include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
+include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk
 include $(GFXLIB)/drivers/gaudio/gadc/driver.mk
 include $(GFXLIB)/drivers/gaudio/pwm/driver.mk
diff --git a/boards/base/Olimex-STM32-LCD/board.mk b/boards/base/Olimex-STM32-LCD/board.mk
index a1e4b935..2dd9d97a 100644
--- a/boards/base/Olimex-STM32-LCD/board.mk
+++ b/boards/base/Olimex-STM32-LCD/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/Olimex-STM32-LCD/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/ILI9320/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/ILI9320/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
 
diff --git a/drivers/gadc/AT91SAM7/gadc_lld.mk b/drivers/gadc/AT91SAM7/driver.mk
index 001d44b1..001d44b1 100644
--- a/drivers/gadc/AT91SAM7/gadc_lld.mk
+++ b/drivers/gadc/AT91SAM7/driver.mk
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld.mk b/drivers/gdisp/ED060SC4/driver.mk
index 0c78e1a7..0c78e1a7 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld.mk
+++ b/drivers/gdisp/ED060SC4/driver.mk
diff --git a/drivers/gdisp/HX8347D/gdisp_lld.mk b/drivers/gdisp/HX8347D/driver.mk
index 581e53e7..5700b999 100644
--- a/drivers/gdisp/HX8347D/gdisp_lld.mk
+++ b/drivers/gdisp/HX8347D/driver.mk
@@ -1,2 +1,2 @@
-GFXINC += $(GFXLIB)/drivers/gdisp/HX8347D
-GFXSRC += $(GFXLIB)/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
+GFXINC += $(GFXLIB)/drivers/gdisp/HX8347D
+GFXSRC += $(GFXLIB)/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
diff --git a/drivers/gdisp/ILI9320/gdisp_lld.mk b/drivers/gdisp/ILI9320/driver.mk
index d61fbc33..d61fbc33 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld.mk
+++ b/drivers/gdisp/ILI9320/driver.mk
diff --git a/drivers/gdisp/ILI9325/gdisp_lld.mk b/drivers/gdisp/ILI9325/driver.mk
index 4dbda578..ef229073 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld.mk
+++ b/drivers/gdisp/ILI9325/driver.mk
@@ -1,2 +1,2 @@
-GFXINC += $(GFXLIB)/drivers/gdisp/ILI9325
-GFXSRC += $(GFXLIB)/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
+GFXINC += $(GFXLIB)/drivers/gdisp/ILI9325
+GFXSRC += $(GFXLIB)/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
diff --git a/drivers/gdisp/ILI9341/gdisp_lld.mk b/drivers/gdisp/ILI9341/driver.mk
index 326b67ad..326b67ad 100644
--- a/drivers/gdisp/ILI9341/gdisp_lld.mk
+++ b/drivers/gdisp/ILI9341/driver.mk
diff --git a/drivers/gdisp/ILI93xx/gdisp_lld.mk b/drivers/gdisp/ILI93xx/driver.mk
index 6c38e49a..6c38e49a 100644
--- a/drivers/gdisp/ILI93xx/gdisp_lld.mk
+++ b/drivers/gdisp/ILI93xx/driver.mk
diff --git a/drivers/gdisp/ILI9481/gdisp_lld.mk b/drivers/gdisp/ILI9481/driver.mk
index 8c971788..8c971788 100644
--- a/drivers/gdisp/ILI9481/gdisp_lld.mk
+++ b/drivers/gdisp/ILI9481/driver.mk
diff --git a/drivers/gdisp/LGD4532/gdisp_lld.mk b/drivers/gdisp/LGD4532/driver.mk
index 8323b891..8323b891 100644
--- a/drivers/gdisp/LGD4532/gdisp_lld.mk
+++ b/drivers/gdisp/LGD4532/driver.mk
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk b/drivers/gdisp/Nokia6610GE12/driver.mk
index 65781667..d4457343 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk
+++ b/drivers/gdisp/Nokia6610GE12/driver.mk
@@ -1,2 +1,2 @@
-GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610GE12
-GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
+GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610GE12
+GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk b/drivers/gdisp/Nokia6610GE8/driver.mk
index a61948b3..a61948b3 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
+++ b/drivers/gdisp/Nokia6610GE8/driver.mk
diff --git a/drivers/gdisp/R61505U/gdisp_lld.mk b/drivers/gdisp/R61505U/driver.mk
index ff0d0bf4..ff0d0bf4 100644
--- a/drivers/gdisp/R61505U/gdisp_lld.mk
+++ b/drivers/gdisp/R61505U/driver.mk
diff --git a/drivers/gdisp/RA8875/gdisp_lld.mk b/drivers/gdisp/RA8875/driver.mk
index 146cf255..146cf255 100644
--- a/drivers/gdisp/RA8875/gdisp_lld.mk
+++ b/drivers/gdisp/RA8875/driver.mk
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.mk b/drivers/gdisp/S6D1121/driver.mk
index 583feb41..583feb41 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.mk
+++ b/drivers/gdisp/S6D1121/driver.mk
diff --git a/drivers/gdisp/SPFD54124B/gdisp_lld.mk b/drivers/gdisp/SPFD54124B/driver.mk
index f5a34259..f5a34259 100644
--- a/drivers/gdisp/SPFD54124B/gdisp_lld.mk
+++ b/drivers/gdisp/SPFD54124B/driver.mk
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.mk b/drivers/gdisp/SSD1289/driver.mk
index fd2713bc..ec6064a8 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.mk
+++ b/drivers/gdisp/SSD1289/driver.mk
@@ -1,2 +1,2 @@
-GFXINC += $(GFXLIB)/drivers/gdisp/SSD1289
-GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
+GFXINC += $(GFXLIB)/drivers/gdisp/SSD1289
+GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
diff --git a/drivers/gdisp/SSD1306/gdisp_lld.mk b/drivers/gdisp/SSD1306/driver.mk
index 13df4230..29c91832 100644
--- a/drivers/gdisp/SSD1306/gdisp_lld.mk
+++ b/drivers/gdisp/SSD1306/driver.mk
@@ -1,2 +1,2 @@
-GFXINC += $(GFXLIB)/drivers/gdisp/SSD1306
-GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
+GFXINC += $(GFXLIB)/drivers/gdisp/SSD1306
+GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
diff --git a/drivers/gdisp/SSD1963/gdisp_lld.mk b/drivers/gdisp/SSD1963/driver.mk
index f56f11de..f56f11de 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld.mk
+++ b/drivers/gdisp/SSD1963/driver.mk
diff --git a/drivers/gdisp/SSD2119/gdisp_lld.mk b/drivers/gdisp/SSD2119/driver.mk
index 921eaa2c..921eaa2c 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld.mk
+++ b/drivers/gdisp/SSD2119/driver.mk
diff --git a/drivers/gdisp/ST7565/gdisp_lld.mk b/drivers/gdisp/ST7565/driver.mk
index 9f9c5408..9f9c5408 100644
--- a/drivers/gdisp/ST7565/gdisp_lld.mk
+++ b/drivers/gdisp/ST7565/driver.mk
diff --git a/drivers/gdisp/TestStub/gdisp_lld.mk b/drivers/gdisp/TestStub/driver.mk
index d8faa3e9..d8faa3e9 100644
--- a/drivers/gdisp/TestStub/gdisp_lld.mk
+++ b/drivers/gdisp/TestStub/driver.mk
diff --git a/drivers/ginput/dial/GADC/ginput_lld.mk b/drivers/ginput/dial/GADC/driver.mk
index 763549b8..763549b8 100644
--- a/drivers/ginput/dial/GADC/ginput_lld.mk
+++ b/drivers/ginput/dial/GADC/driver.mk
diff --git a/drivers/ginput/toggle/Pal/ginput_lld.mk b/drivers/ginput/toggle/Pal/driver.mk
index d398da9d..b48fe83a 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld.mk
+++ b/drivers/ginput/toggle/Pal/driver.mk
@@ -1,5 +1,5 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/ginput/toggle/Pal
+# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/ginput/toggle/Pal
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld.mk b/drivers/ginput/touch/ADS7843/driver.mk
index b6ac0ea6..31e9ab2c 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld.mk
+++ b/drivers/ginput/touch/ADS7843/driver.mk
@@ -1,5 +1,5 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/ginput/touch/ADS7843
+# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/ginput/touch/ADS7843
diff --git a/drivers/ginput/touch/FT5x06/ginput_lld.mk b/drivers/ginput/touch/FT5x06/driver.mk
index 17d38c61..17d38c61 100644
--- a/drivers/ginput/touch/FT5x06/ginput_lld.mk
+++ b/drivers/ginput/touch/FT5x06/driver.mk
diff --git a/drivers/ginput/touch/MCU/ginput_lld.mk b/drivers/ginput/touch/MCU/driver.mk
index eb8fb2d8..e771236a 100644
--- a/drivers/ginput/touch/MCU/ginput_lld.mk
+++ b/drivers/ginput/touch/MCU/driver.mk
@@ -1,5 +1,5 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld_mouse.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/ginput/touch/MCU
+# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld_mouse.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/ginput/touch/MCU
diff --git a/drivers/ginput/touch/STMPE811/ginput_lld.mk b/drivers/ginput/touch/STMPE811/driver.mk
index f6d77f1c..5147e989 100644
--- a/drivers/ginput/touch/STMPE811/ginput_lld.mk
+++ b/drivers/ginput/touch/STMPE811/driver.mk
@@ -1,5 +1,5 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/ginput/touch/STMPE811
+# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/ginput/touch/STMPE811
diff --git a/drivers/multiple/X/gdisp_lld.mk b/drivers/multiple/X/driver.mk
index 572a5b7d..572a5b7d 100644
--- a/drivers/multiple/X/gdisp_lld.mk
+++ b/drivers/multiple/X/driver.mk
diff --git a/drivers/multiple/uGFXnet/gdisp_lld.mk b/drivers/multiple/uGFXnet/driver.mk
index 89bd7cf2..89bd7cf2 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld.mk
+++ b/drivers/multiple/uGFXnet/driver.mk