OLED: driver naming cleanups (#21710)

author: Ryan <fauxpark@gmail.com> 2023-08-15 19:30:34 +1000
committer: GitHub <noreply@github.com> 2023-08-15 10:30:34 +0100
commit: 5d2f2af19897d1f5fd35cb8475fc8b3f74f201f1 (patch)
tree: 4e2a8b21bd41dc036a91562b4f25257d5b8701e0
parent: 0ac8221a0a423d1a74238fcdf6b489bfe865c2e7 (diff)
263 files changed, 19 insertions, 306 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 372c906d1c..47fe56e4aa 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -747,8 +747,8 @@ ifeq ($(strip $(HD44780_ENABLE)), yes)
    SRC += hd44780.c
 endif
-VALID_OLED_DRIVER_TYPES := SSD1306 custom
+VALID_OLED_DRIVER_TYPES := custom ssd1306
-OLED_DRIVER ?= SSD1306
+OLED_DRIVER ?= ssd1306
 VALID_OLED_TRANSPORT_TYPES := i2c spi custom
 OLED_TRANSPORT ?= i2c
 ifeq ($(strip $(OLED_ENABLE)), yes)
diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index a62294b23a..f3769742f8 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -29,17 +29,17 @@ OLED_ENABLE = yes
 |OLED Driver        |Supported Device                    |
 |-------------------|------------------------------------|
-|SSD1306 (default)  |For both SSD1306, SH1106, and SH1107|
+|`ssd1306` (default)|For both SSD1306, SH1106, and SH1107|
 e.g.
 ```make
-OLED_DRIVER = SSD1306
+OLED_DRIVER = ssd1306
 ```
 |OLED Transport |                                                |
 |---------------|------------------------------------------------|
-|i2c (default)  | Uses I2C for communication with the OLED panel |
+|`i2c` (default)| Uses I2C for communication with the OLED panel |
-|spi            | Uses SPI for communication with the OLED panel |
+|`spi`          | Uses SPI for communication with the OLED panel |
 e.g.
 ```make
diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk
index 77dd67f53f..60cbfd4df6 100644
--- a/keyboards/0xcb/1337/rules.mk
+++ b/keyboards/0xcb/1337/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk
index 24ff2f2cfd..fe8dabeab7 100644
--- a/keyboards/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk
index 9cc3b02a22..f06d31c5f1 100644
--- a/keyboards/0xcb/tutelpad/rules.mk
+++ b/keyboards/0xcb/tutelpad/rules.mk
@@ -10,6 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-\ No newline at end of file
diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk
index 2c0b66f84d..12bfe122d6 100644
--- a/keyboards/10bleoledhub/rules.mk
+++ b/keyboards/10bleoledhub/rules.mk
@@ -15,5 +15,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk
index 96f930ffa1..e3e55077cb 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk
@@ -22,4 +22,3 @@ WS2812_DRIVER         = vendor
 ENCODER_ENABLE        = yes
 ENCODER_MAP_ENABLE    = yes
 OLED_ENABLE           = yes
-OLED_DRIVER           = SSD1306
-\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index e858deae6a..3451f44976 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk
index eaeebeff07..f8febbdec8 100644
--- a/keyboards/25keys/cassette42/rules.mk
+++ b/keyboards/25keys/cassette42/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 SRC += ./common/oled_helper.c
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
index d24a189b81..d313f3a4f9 100644
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
+++ b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
@@ -5,5 +5,4 @@ GRAVE_ESC_ENABLE = no
 MAGIC_ENABLE = no
 ENCODER_MAP_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/rules.mk b/keyboards/adpenrose/kintsugi/rules.mk
index 4704a3487d..864f929c81 100644
--- a/keyboards/adpenrose/kintsugi/rules.mk
+++ b/keyboards/adpenrose/kintsugi/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes                # Encoder functionality
 OLED_ENABLE = yes           # OLED functionality
-OLED_DRIVER = SSD1306
diff --git a/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
index e9a8bec879..ab9d5c6ac2 100644
--- a/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
+++ b/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-# OLED_DRIVER = not a real thing
diff --git a/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
index e9a8bec879..ab9d5c6ac2 100644
--- a/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
+++ b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-# OLED_DRIVER = not a real thing
diff --git a/keyboards/aidansmithdotdev/fine40/rules.mk b/keyboards/aidansmithdotdev/fine40/rules.mk
index 2e3ef9fb84..e69de29bb2 100644
--- a/keyboards/aidansmithdotdev/fine40/rules.mk
+++ b/keyboards/aidansmithdotdev/fine40/rules.mk
@@ -1 +0,0 @@
-OLED_DRIVER = SSD1306
diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk
index 3f1afb07c1..8fc2f2ff25 100644
--- a/keyboards/aleblazer/zodiark/rules.mk
+++ b/keyboards/aleblazer/zodiark/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
index c3600290d9..0e5631b02b 100644
--- a/keyboards/anavi/knob1/rules.mk
+++ b/keyboards/anavi/knob1/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk
index c3600290d9..0e5631b02b 100644
--- a/keyboards/anavi/knobs3/rules.mk
+++ b/keyboards/anavi/knobs3/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/anavi/macropad8/rules.mk b/keyboards/anavi/macropad8/rules.mk
index f5e38fc8cb..63d200481c 100644
--- a/keyboards/anavi/macropad8/rules.mk
+++ b/keyboards/anavi/macropad8/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/aplyard/aplx6/rev2/rules.mk b/keyboards/aplyard/aplx6/rev2/rules.mk
index 90decf0341..bb653a97f2 100644
--- a/keyboards/aplyard/aplx6/rev2/rules.mk
+++ b/keyboards/aplyard/aplx6/rev2/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for Oled Display
 ENCODER_ENABLE = yes        # Enable Support for Encoder
diff --git a/keyboards/arabica37/keymaps/default/rules.mk b/keyboards/arabica37/keymaps/default/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/arabica37/keymaps/default/rules.mk
+++ b/keyboards/arabica37/keymaps/default/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
index 1af84436ed..76e55c05f4 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk
index da4886f7d7..513c25d04d 100644
--- a/keyboards/avalanche/v4/rules.mk
+++ b/keyboards/avalanche/v4/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk
index e9d1e52c16..1e24ec177f 100644
--- a/keyboards/basekeys/slice/rev1_rgb/rules.mk
+++ b/keyboards/basekeys/slice/rev1_rgb/rules.mk
@@ -12,6 +12,5 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Disable OLED driver.
 LTO_ENABLE = yes
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/rules.mk b/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
index 6b5678dd27..fb46c2589d 100644
--- a/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
+++ b/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
@@ -6,7 +6,6 @@ LTO_ENABLE = no
 EXTRAKEY_ENABLE = no
 # ENCODER_ENABLE = no
-# OLED_DRIVER_ENABLE = no
 # WPM_ENABLE = no
 # Enable keyboard underlight functionality
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk b/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk
+++ b/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
+++ b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/bolsa/damapad/rules.mk b/keyboards/bolsa/damapad/rules.mk
index 395f25f859..9c75f75d52 100644
--- a/keyboards/bolsa/damapad/rules.mk
+++ b/keyboards/bolsa/damapad/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index 777d555b2d..f5ef6ba5a2 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -14,4 +14,3 @@ RGB_MATRIX_ENABLE = no
 HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk
index 13c63d5b17..2beb545ece 100644
--- a/keyboards/buzzard/rev1/rules.mk
+++ b/keyboards/buzzard/rev1/rules.mk
@@ -1,4 +1,2 @@
-OLED_DRIVER = SSD1306
 PS2_ENABLE = yes
 PS2_DRIVER = interrupt
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index 35c6daa727..8cee2da595 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -16,8 +16,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 #BACKLIGHT_ENABLE = yes
 DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
diff --git a/keyboards/ckeys/washington/rules.mk b/keyboards/ckeys/washington/rules.mk
index 87154d95c9..c6c08dda59 100644
--- a/keyboards/ckeys/washington/rules.mk
+++ b/keyboards/ckeys/washington/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable support for encoders
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable support for OLED displays
diff --git a/keyboards/controllerworks/mini36/rules.mk b/keyboards/controllerworks/mini36/rules.mk
index ee37cd7f6f..161ec22b16 100644
--- a/keyboards/controllerworks/mini36/rules.mk
+++ b/keyboards/controllerworks/mini36/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-OLED_DRIVER   = SSD1306
-\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/rules.mk b/keyboards/controllerworks/mini42/rules.mk
index 71f52c4e4d..161ec22b16 100644
--- a/keyboards/controllerworks/mini42/rules.mk
+++ b/keyboards/controllerworks/mini42/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-OLED_DRIVER   = SSD1306
diff --git a/keyboards/crkbd/keymaps/ajarov/rules.mk b/keyboards/crkbd/keymaps/ajarov/rules.mk
index 3e637d11da..bc45ff83ba 100644
--- a/keyboards/crkbd/keymaps/ajarov/rules.mk
+++ b/keyboards/crkbd/keymaps/ajarov/rules.mk
@@ -1,5 +1,4 @@
 MOUSEKEY_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
diff --git a/keyboards/crkbd/keymaps/armand1m/rules.mk b/keyboards/crkbd/keymaps/armand1m/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/crkbd/keymaps/armand1m/rules.mk
+++ b/keyboards/crkbd/keymaps/armand1m/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/benrestech/rules.mk b/keyboards/crkbd/keymaps/benrestech/rules.mk
index c177a33cf5..462ceeb32b 100644
--- a/keyboards/crkbd/keymaps/benrestech/rules.mk
+++ b/keyboards/crkbd/keymaps/benrestech/rules.mk
@@ -1,3 +1,2 @@
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/bermeo/rules.mk b/keyboards/crkbd/keymaps/bermeo/rules.mk
index e666f1f0cb..369b90ce38 100644
--- a/keyboards/crkbd/keymaps/bermeo/rules.mk
+++ b/keyboards/crkbd/keymaps/bermeo/rules.mk
@@ -3,7 +3,6 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = no
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
 SLEEP_LED_ENABLE   = yes
 WPM_ENABLE         = yes
@@ -16,4 +15,4 @@ BOOTMAGIC_ENABLE   = no
 COMBO_ENABLE       = no
 AUDIO_ENABLE       = no
 MIDI_ENABLE                = no
-BLUETOOTH_ENABLE   = no
-\ No newline at end of file
+BLUETOOTH_ENABLE   = no
diff --git a/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk b/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk
index f599849448..f0b00f3cf0 100644
--- a/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk
+++ b/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk
@@ -1,7 +1,6 @@
 BOOTMAGIC_ENABLE = no
 BOOLOADER = atmel-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
 COMMAND_ENABLE = no             # Disables the command feature
 COMBO_ENABLE = yes
@@ -12,4 +11,4 @@ MIDI_ENABLE = no
 BLUETOOTH_ENABLE = no
 BACKLIGHT_ENABLE = no
 CAPS_WORD_ENABLE = yes
-CUSTOM_ONESHOT_ENABLE = yes
-\ No newline at end of file
+CUSTOM_ONESHOT_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/colemad/rules.mk b/keyboards/crkbd/keymaps/colemad/rules.mk
index 6f9d31a755..70eb5c3318 100644
--- a/keyboards/crkbd/keymaps/colemad/rules.mk
+++ b/keyboards/crkbd/keymaps/colemad/rules.mk
@@ -4,7 +4,6 @@ SPLIT_KEYBOARD = yes
 TAP_DANCE_ENABLE = yes
 MOUSEKEY_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # Link Time Optimization (Reduces compiled size)
diff --git a/keyboards/crkbd/keymaps/colemak_luna/rules.mk b/keyboards/crkbd/keymaps/colemak_luna/rules.mk
index a26c4eb8a3..9ff3128931 100644
--- a/keyboards/crkbd/keymaps/colemak_luna/rules.mk
+++ b/keyboards/crkbd/keymaps/colemak_luna/rules.mk
@@ -3,6 +3,5 @@ RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes    # Enable WS2812 RGB underlight.
 VIA_ENABLE      = yes    # Enable VIA
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
 WPM_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/crkdves/rules.mk b/keyboards/crkbd/keymaps/crkdves/rules.mk
index d3a964424f..d95e1136bb 100644
--- a/keyboards/crkbd/keymaps/crkdves/rules.mk
+++ b/keyboards/crkbd/keymaps/crkdves/rules.mk
@@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
diff --git a/keyboards/crkbd/keymaps/crkqwes/rules.mk b/keyboards/crkbd/keymaps/crkqwes/rules.mk
index d3a964424f..d95e1136bb 100644
--- a/keyboards/crkbd/keymaps/crkqwes/rules.mk
+++ b/keyboards/crkbd/keymaps/crkqwes/rules.mk
@@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
diff --git a/keyboards/crkbd/keymaps/devdev/rules.mk b/keyboards/crkbd/keymaps/devdev/rules.mk
index 4aaf22fd04..4d53cc7564 100644
--- a/keyboards/crkbd/keymaps/devdev/rules.mk
+++ b/keyboards/crkbd/keymaps/devdev/rules.mk
@@ -2,4 +2,3 @@ MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/edvorakjp/rules.mk b/keyboards/crkbd/keymaps/edvorakjp/rules.mk
index 1291d50e92..c019c30756 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/rules.mk
+++ b/keyboards/crkbd/keymaps/edvorakjp/rules.mk
@@ -17,7 +17,6 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 TAP_DANCE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/gotham/rules.mk b/keyboards/crkbd/keymaps/gotham/rules.mk
index 48a2c1d72a..455cf708a6 100644
--- a/keyboards/crkbd/keymaps/gotham/rules.mk
+++ b/keyboards/crkbd/keymaps/gotham/rules.mk
@@ -3,5 +3,4 @@ EXTRAKEY_ENABLE = yes
 AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/hvp/rules.mk b/keyboards/crkbd/keymaps/hvp/rules.mk
index c7ed029e3d..3091ed20af 100644
--- a/keyboards/crkbd/keymaps/hvp/rules.mk
+++ b/keyboards/crkbd/keymaps/hvp/rules.mk
@@ -10,5 +10,4 @@ SRC +=  ./lib/rgb_state_reader.c \
 TAP_DANCE_ENABLE = yes
 EXTRAKEY_ENABLE = yes        # Audio control and System control
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 # LOCAL_GLCDFONT = yes
diff --git a/keyboards/crkbd/keymaps/jarred/rules.mk b/keyboards/crkbd/keymaps/jarred/rules.mk
index f18100d7ff..efa378b099 100644
--- a/keyboards/crkbd/keymaps/jarred/rules.mk
+++ b/keyboards/crkbd/keymaps/jarred/rules.mk
@@ -17,7 +17,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/jpe230/rules.mk b/keyboards/crkbd/keymaps/jpe230/rules.mk
index b78c1d45f3..459cf9c691 100644
--- a/keyboards/crkbd/keymaps/jpe230/rules.mk
+++ b/keyboards/crkbd/keymaps/jpe230/rules.mk
@@ -1,6 +1,5 @@
 # Shared rules for both of my Corne
 OLED_ENABLE       = yes
-OLED_DRIVER       = SSD1306
 VIA_ENABLE        = yes
 RGB_MATRIX_ENABLE = yes
@@ -22,4 +21,3 @@ else
    SRC +=  oled/avr/master/oled_master_handler.c \
            oled/avr/slave/oled_slave_handler.c
 endif
diff --git a/keyboards/crkbd/keymaps/julian_turner/rules.mk b/keyboards/crkbd/keymaps/julian_turner/rules.mk
index e6ddd80076..1717383ec4 100644
--- a/keyboards/crkbd/keymaps/julian_turner/rules.mk
+++ b/keyboards/crkbd/keymaps/julian_turner/rules.mk
@@ -1,7 +1,6 @@
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/kidbrazil/rules.mk b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
index d2c2f649e0..c16efc66e3 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/rules.mk
+++ b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
@@ -6,7 +6,6 @@ MOUSEKEY_ENABLE = no
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # If you want to change the display of OLED, you need to change here
 SRC +=  logo_reader.c \
diff --git a/keyboards/crkbd/keymaps/madhatter/rules.mk b/keyboards/crkbd/keymaps/madhatter/rules.mk
index 89a2791bcd..ed64986331 100644
--- a/keyboards/crkbd/keymaps/madhatter/rules.mk
+++ b/keyboards/crkbd/keymaps/madhatter/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 # If you want to change the display of OLED, you need to change here
 SRC +=  ./lib/rgb_state_reader.c \
diff --git a/keyboards/crkbd/keymaps/mcrown/rules.mk b/keyboards/crkbd/keymaps/mcrown/rules.mk
index 922e246ba9..8b6f82d5df 100644
--- a/keyboards/crkbd/keymaps/mcrown/rules.mk
+++ b/keyboards/crkbd/keymaps/mcrown/rules.mk
@@ -7,7 +7,6 @@ MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
 RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix.
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = yes    # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/nimishgautam/rules.mk b/keyboards/crkbd/keymaps/nimishgautam/rules.mk
index 84ae6248cb..dcb0007591 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/rules.mk
+++ b/keyboards/crkbd/keymaps/nimishgautam/rules.mk
@@ -1,6 +1,5 @@
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 COMBO_ENABLE = yes
 TAP_DANCE_ENABLE = yes  # enable tap dance features
 EXTRAKEY_ENABLE = no
diff --git a/keyboards/crkbd/keymaps/ninjonas/rules.mk b/keyboards/crkbd/keymaps/ninjonas/rules.mk
index c40a827798..6dd34f26d7 100644
--- a/keyboards/crkbd/keymaps/ninjonas/rules.mk
+++ b/keyboards/crkbd/keymaps/ninjonas/rules.mk
@@ -1,7 +1,6 @@
 RGB_MATRIX_ENABLE = yes
 MOUSEKEY_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/oled_sample/rules.mk b/keyboards/crkbd/keymaps/oled_sample/rules.mk
index d9db223cfa..676795847a 100644
--- a/keyboards/crkbd/keymaps/oled_sample/rules.mk
+++ b/keyboards/crkbd/keymaps/oled_sample/rules.mk
@@ -5,4 +5,3 @@
 #
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/ollyhayes/rules.mk b/keyboards/crkbd/keymaps/ollyhayes/rules.mk
index 2dcd9007e5..f2bf2ce07b 100644
--- a/keyboards/crkbd/keymaps/ollyhayes/rules.mk
+++ b/keyboards/crkbd/keymaps/ollyhayes/rules.mk
@@ -1,7 +1,6 @@
 SRC += oled.c
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 EXTRAKEY_ENABLE = yes
 UNICODE_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/oo/rules.mk b/keyboards/crkbd/keymaps/oo/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/crkbd/keymaps/oo/rules.mk
+++ b/keyboards/crkbd/keymaps/oo/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/rarick/rules.mk b/keyboards/crkbd/keymaps/rarick/rules.mk
index 775268a1d4..2528fec9b0 100644
--- a/keyboards/crkbd/keymaps/rarick/rules.mk
+++ b/keyboards/crkbd/keymaps/rarick/rules.mk
@@ -4,9 +4,6 @@ BOOTLOADER = atmel-dfu
 # Enable RGB matric
 RGB_MATRIX_ENABLE = yes
-# Enable OLED driver
-OLED_DRIVER_ENABLE = yes
 # Enable media keys
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
index c6c258e255..e7c9b4b953 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
+++ b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
@@ -5,4 +5,3 @@ BOOTLOADER = atmel-dfu
 EXTRAKEY_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/rmeli/rules.mk b/keyboards/crkbd/keymaps/rmeli/rules.mk
index 58a00ed6ba..107c493978 100644
--- a/keyboards/crkbd/keymaps/rmeli/rules.mk
+++ b/keyboards/crkbd/keymaps/rmeli/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 TAP_DANCE_ENABLE = yes
 AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rules.mk b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
index 2366f669a0..4df519b074 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/rules.mk
+++ b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
@@ -29,7 +29,6 @@ SLEEP_LED_ENABLE   = no    # Breathing sleep LED during USB suspend
 BOOTLOADER       = qmk-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ifeq ($(strip $(THEME)), godspeed)
    OPT_DEFS += -DTHEME_GODSPEED
diff --git a/keyboards/crkbd/keymaps/sharkby7e/rules.mk b/keyboards/crkbd/keymaps/sharkby7e/rules.mk
index 38a8cf1bdb..17406603fe 100644
--- a/keyboards/crkbd/keymaps/sharkby7e/rules.mk
+++ b/keyboards/crkbd/keymaps/sharkby7e/rules.mk
@@ -1,6 +1,5 @@
 MOUSEKEY_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
 BOOTLOADER = caterina
diff --git a/keyboards/crkbd/keymaps/snowe/rules.mk b/keyboards/crkbd/keymaps/snowe/rules.mk
index 96ae4bbf95..10cf2fa97c 100644
--- a/keyboards/crkbd/keymaps/snowe/rules.mk
+++ b/keyboards/crkbd/keymaps/snowe/rules.mk
@@ -14,7 +14,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 RGBLIGHT_TWINKLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 RGB_MATRIX_ENABLE = yes
 OCEAN_DREAM_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/soundmonster/rules.mk b/keyboards/crkbd/keymaps/soundmonster/rules.mk
index d3a964424f..d95e1136bb 100644
--- a/keyboards/crkbd/keymaps/soundmonster/rules.mk
+++ b/keyboards/crkbd/keymaps/soundmonster/rules.mk
@@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
diff --git a/keyboards/crkbd/keymaps/sulrich/rules.mk b/keyboards/crkbd/keymaps/sulrich/rules.mk
index 24d83947a9..61b07ad0df 100644
--- a/keyboards/crkbd/keymaps/sulrich/rules.mk
+++ b/keyboards/crkbd/keymaps/sulrich/rules.mk
@@ -1,3 +1,2 @@
 EXTRAKEY_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk b/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
index 193aa14dac..d3bbc97a23 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
@@ -17,7 +17,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/rules.mk b/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
index adc61ea60d..0621b371e9 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
+++ b/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
@@ -4,7 +4,6 @@ AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 TAP_DANCE_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/toinux/rules.mk b/keyboards/crkbd/keymaps/toinux/rules.mk
index 07c98a08f8..59b90c792c 100644
--- a/keyboards/crkbd/keymaps/toinux/rules.mk
+++ b/keyboards/crkbd/keymaps/toinux/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE   = yes    # Mouse keys
 RGBLIGHT_ENABLE   = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE       = yes
-OLED_DRIVER       = SSD1306
 LTO_ENABLE        = yes
 BOOTLOADER        = atmel-dfu
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk b/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
index ed4d34a70b..d2e0957c49 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
@@ -1,7 +1,6 @@
 # Build Options
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 BOOTLOADER = atmel-dfu
diff --git a/keyboards/crkbd/keymaps/vxid/rules.mk b/keyboards/crkbd/keymaps/vxid/rules.mk
index 432e219476..b14970fbf3 100644
--- a/keyboards/crkbd/keymaps/vxid/rules.mk
+++ b/keyboards/crkbd/keymaps/vxid/rules.mk
@@ -17,7 +17,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/xyverz/rules.mk b/keyboards/crkbd/keymaps/xyverz/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/crkbd/keymaps/xyverz/rules.mk
+++ b/keyboards/crkbd/keymaps/xyverz/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk
index b696e1de8b..9fe565335a 100644
--- a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk
+++ b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk
@@ -5,5 +5,4 @@ MOUSEKEY_ENABLE = yes    # Mouse keys
 RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
 # RGB_MATRIX_ENABLE = no
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
diff --git a/keyboards/dailycraft/claw44/keymaps/oled/rules.mk b/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
+++ b/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk b/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
index 6af3117b94..cd11afc8d4 100644
--- a/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
+++ b/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE    = no
 MIDI_ENABLE        = no
diff --git a/keyboards/doio/kb16/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk
index 5c5ad3de8c..b234c1ca6a 100644
--- a/keyboards/doio/kb16/rev1/rules.mk
+++ b/keyboards/doio/kb16/rev1/rules.mk
@@ -20,7 +20,6 @@ SPACE_CADET_ENABLE = no
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk
index f931af11e4..88879a4ffa 100644
--- a/keyboards/doio/kb16/rev2/rules.mk
+++ b/keyboards/doio/kb16/rev2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_ENABLE = no           # Audio output
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk
index a6ad4b74ca..1e48f891f2 100644
--- a/keyboards/doio/kb30/rules.mk
+++ b/keyboards/doio/kb30/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk
index 4ddaccda46..0551c8b370 100644
--- a/keyboards/doodboard/duckboard/rules.mk
+++ b/keyboards/doodboard/duckboard/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/doodboard/duckboard_r2/rules.mk b/keyboards/doodboard/duckboard_r2/rules.mk
index 4ddaccda46..0551c8b370 100644
--- a/keyboards/doodboard/duckboard_r2/rules.mk
+++ b/keyboards/doodboard/duckboard_r2/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/draculad/keymaps/pimoroni/rules.mk b/keyboards/draculad/keymaps/pimoroni/rules.mk
index 66d3bf0e46..72ace5a3df 100644
--- a/keyboards/draculad/keymaps/pimoroni/rules.mk
+++ b/keyboards/draculad/keymaps/pimoroni/rules.mk
@@ -2,5 +2,4 @@
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pimoroni_trackball
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk
index 453d3b26b1..5f5fd002a1 100644
--- a/keyboards/draculad/rules.mk
+++ b/keyboards/draculad/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/dumbo/keymaps/default/rules.mk b/keyboards/dumbo/keymaps/default/rules.mk
index a2d6e788f9..0f4dda2647 100644
--- a/keyboards/dumbo/keymaps/default/rules.mk
+++ b/keyboards/dumbo/keymaps/default/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
diff --git a/keyboards/dumbo/keymaps/trip-trap/rules.mk b/keyboards/dumbo/keymaps/trip-trap/rules.mk
index 1913e10c49..023239d3ee 100644
--- a/keyboards/dumbo/keymaps/trip-trap/rules.mk
+++ b/keyboards/dumbo/keymaps/trip-trap/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 WPM_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x_oled/rules.mk b/keyboards/dumbpad/v1x_oled/rules.mk
index 073a351a03..53db407bc3 100644
--- a/keyboards/dumbpad/v1x_oled/rules.mk
+++ b/keyboards/dumbpad/v1x_oled/rules.mk
@@ -13,5 +13,4 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk b/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk
index 63e79e2da9..98ca45243d 100644
--- a/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk
+++ b/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+WPM_ENABLE = yes
-WPM_ENABLE = yes
-\ No newline at end of file
diff --git a/keyboards/ein_60/rules.mk b/keyboards/ein_60/rules.mk
index 648a0c38ff..541e00aa44 100644
--- a/keyboards/ein_60/rules.mk
+++ b/keyboards/ein_60/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no      # Enable for pretty RGB matrix effects
 ENCODER_ENABLE = yes        # Enables the use of one or more encoders
 OLED_ENABLE = yes           # Enables the use of OLED displays
-OLED_DRIVER = SSD1306
diff --git a/keyboards/fearherbs1/blue_team_pad/rules.mk b/keyboards/fearherbs1/blue_team_pad/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/fearherbs1/blue_team_pad/rules.mk
+++ b/keyboards/fearherbs1/blue_team_pad/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk
index 731941b437..e8d7a7aed5 100644
--- a/keyboards/fungo/rev1/rules.mk
+++ b/keyboards/fungo/rev1/rules.mk
@@ -14,6 +14,4 @@ KEY_LOCK_ENABLE = yes       # kc_lock use
 OLED_ENABLE = no
-OLED_DRIVER = SSD1306      # OLED display
 SPLIT_KEYBOARD = yes       # split type
diff --git a/keyboards/gboards/gergo/keymaps/oled/rules.mk b/keyboards/gboards/gergo/keymaps/oled/rules.mk
index 7880416719..e1bd70f656 100644
--- a/keyboards/gboards/gergo/keymaps/oled/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/oled/rules.mk
@@ -8,7 +8,6 @@ BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
 SCROLLSTEP = 1                  # Lines to scroll with ball
 MOUSEKEY_ENABLE = yes           # Mouse keys, needed for baller
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LOCAL_GLCDFONT = yes
 #Debug options
diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk
index 9eef6b6cc4..acdf49b47d 100644
--- a/keyboards/gopolar/gg86/rules.mk
+++ b/keyboards/gopolar/gg86/rules.mk
@@ -22,4 +22,3 @@ RGB_MATRIX_ENABLE = yes
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306       # OLED display
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
index d07da3fca0..188b4696f1 100644
--- a/keyboards/hadron/ver2/rules.mk
+++ b/keyboards/hadron/ver2/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index 887fbcbfeb..edc5fa7d5b 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -14,5 +14,4 @@ RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
 HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLER = yes
diff --git a/keyboards/handwired/amigopunk/rules.mk b/keyboards/handwired/amigopunk/rules.mk
index 395f25f859..9c75f75d52 100644
--- a/keyboards/handwired/amigopunk/rules.mk
+++ b/keyboards/handwired/amigopunk/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk
index 411362b652..7fa8dfdd34 100644
--- a/keyboards/handwired/d48/rules.mk
+++ b/keyboards/handwired/d48/rules.mk
@@ -13,7 +13,6 @@ USE_I2C = no
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 UNICODE_ENABLE = yes
 SRC += ds1307.c taphold.c
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk
index 6e58ff5d15..c83f96e102 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk
@@ -1,5 +1,4 @@
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/marauder/keymaps/orvia/rules.mk b/keyboards/handwired/marauder/keymaps/orvia/rules.mk
index 9b5ee6b6fa..e39f8c6e9e 100644
--- a/keyboards/handwired/marauder/keymaps/orvia/rules.mk
+++ b/keyboards/handwired/marauder/keymaps/orvia/rules.mk
@@ -1,4 +1,3 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # OLED Driver Enable
 WPM_ENABLE = yes                        # WPM counting Enable
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
index a67d345674..e09e2e2bbe 100644
--- a/keyboards/handwired/myskeeb/rules.mk
+++ b/keyboards/handwired/myskeeb/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes        # Enables split keyboard support
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/handwired/obuwunkunubi/spaget/rules.mk b/keyboards/handwired/obuwunkunubi/spaget/rules.mk
index bf275d4f6f..9652815de2 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/rules.mk
+++ b/keyboards/handwired/obuwunkunubi/spaget/rules.mk
@@ -14,6 +14,4 @@ UNICODE_ENABLE = yes     # Unicode
 AUDIO_ENABLE = no        # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306 # Enable OLED display support
 ENCODER_ENABLE = yes     # Enable encoder support
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
index a5429ba993..0e5631b02b 100644
--- a/keyboards/handwired/onekey/kb2040/rules.mk
+++ b/keyboards/handwired/onekey/kb2040/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/handwired/onekey/keymaps/oled/rules.mk b/keyboards/handwired/onekey/keymaps/oled/rules.mk
index 83757b1909..f39e8ce4bd 100644
--- a/keyboards/handwired/onekey/keymaps/oled/rules.mk
+++ b/keyboards/handwired/onekey/keymaps/oled/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 TAP_DANCE_ENABLE = yes
 CONSOLE_ENABLE = yes
diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk b/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk
index f7d65c56c2..6bb5fa1581 100644
--- a/keyboards/handwired/pill60/rules.mk
+++ b/keyboards/handwired/pill60/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 DEFAULT_FOLDER = handwired/pill60/bluepill
diff --git a/keyboards/handwired/swiftrax/koalafications/rules.mk b/keyboards/handwired/swiftrax/koalafications/rules.mk
index 51909d1883..efd14377bf 100644
--- a/keyboards/handwired/swiftrax/koalafications/rules.mk
+++ b/keyboards/handwired/swiftrax/koalafications/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/handwired/swiftrax/the_galleon/rules.mk b/keyboards/handwired/swiftrax/the_galleon/rules.mk
index 5587a8dbbc..dec78ae408 100644
--- a/keyboards/handwired/swiftrax/the_galleon/rules.mk
+++ b/keyboards/handwired/swiftrax/the_galleon/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Rotary Encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # I2C OLED
diff --git a/keyboards/handwired/tsubasa/rules.mk b/keyboards/handwired/tsubasa/rules.mk
index cddbc1e33f..5838d93ad5 100644
--- a/keyboards/handwired/tsubasa/rules.mk
+++ b/keyboards/handwired/tsubasa/rules.mk
@@ -15,5 +15,4 @@ LTO_ENABLE = yes
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk
index 2eaa722497..f0f9be4985 100644
--- a/keyboards/handwired/uthol/rev3/rules.mk
+++ b/keyboards/handwired/uthol/rev3/rules.mk
@@ -5,7 +5,6 @@ BOOTMAGIC_ENABLE = yes
 NKRO_ENABLE = yes
 KEYBOARD_SHARED_EP = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk
index ede296e1e8..8a33a55331 100644
--- a/keyboards/hardwareabstraction/handwire/rules.mk
+++ b/keyboards/hardwareabstraction/handwire/rules.mk
@@ -3,6 +3,5 @@ HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
index 5a9c1e2890..09e14f46ee 100644
--- a/keyboards/helix/rev2/keymaps/xulkal/rules.mk
+++ b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
@@ -3,7 +3,6 @@ RGBLIGHT_ENABLE = yes
 OPT_DEFS += -DRGBLED_BACK
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # Helix specific font file
 OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
 # Xulkal specific oled define
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 6e63cc7172..4bfee0411d 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -63,7 +63,6 @@ ifeq ($(strip $(LED_ANIMATIONS)), yes)
 endif
 ifeq ($(strip $(OLED_ENABLE)), yes)
-    OLED_DRIVER = SSD1306
    ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
       OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
    else
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index 23b73845f0..a46f9d9c59 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -3,7 +3,6 @@ RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index 23b73845f0..a46f9d9c59 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -3,7 +3,6 @@ RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index c6854d8a44..fd1825af35 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -31,7 +31,6 @@ RGB_MATRIX_ENABLE = yes
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 # Wear-levelling driver
diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk
index 933affaa86..9ac59719d8 100644
--- a/keyboards/horrortroll/lemon40/rules.mk
+++ b/keyboards/horrortroll/lemon40/rules.mk
@@ -15,7 +15,6 @@ AUDIO_ENABLE = no           # Audio output
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 # Additional thing to reduce compiled size
diff --git a/keyboards/jagdpietr/drakon/rules.mk b/keyboards/jagdpietr/drakon/rules.mk
index 94fd5ee9d1..d670d935a0 100644
--- a/keyboards/jagdpietr/drakon/rules.mk
+++ b/keyboards/jagdpietr/drakon/rules.mk
@@ -14,5 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 WPM_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/jaykeeb/kamigakushi/rules.mk b/keyboards/jaykeeb/kamigakushi/rules.mk
index 24f0fb91d3..161ec22b16 100644
--- a/keyboards/jaykeeb/kamigakushi/rules.mk
+++ b/keyboards/jaykeeb/kamigakushi/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-OLED_DRIVER = SSD1306
-\ No newline at end of file
diff --git a/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk b/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
index 7a7b1acc03..80b82b2a5c 100644
--- a/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
+++ b/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
@@ -1,3 +1,2 @@
 # Enable SSD1306 OLED
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
index e10619259c..213576dfbd 100644
--- a/keyboards/kakunpc/angel64/rules.mk
+++ b/keyboards/kakunpc/angel64/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/kakunpc/business_card/alpha/rules.mk b/keyboards/kakunpc/business_card/alpha/rules.mk
index fa42618a3b..6744c64e1b 100644
--- a/keyboards/kakunpc/business_card/alpha/rules.mk
+++ b/keyboards/kakunpc/business_card/alpha/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kakunpc/business_card/beta/rules.mk b/keyboards/kakunpc/business_card/beta/rules.mk
index fa42618a3b..6744c64e1b 100644
--- a/keyboards/kakunpc/business_card/beta/rules.mk
+++ b/keyboards/kakunpc/business_card/beta/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
index 85df4231d5..80475ea69a 100644
--- a/keyboards/kakunpc/suihankey/rules.mk
+++ b/keyboards/kakunpc/suihankey/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 SPLIT_KEYBOARD = no
 DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/keybage/radpad/rules.mk b/keyboards/keybage/radpad/rules.mk
index 18b77f249e..f1e31ddbdc 100644
--- a/keyboards/keybage/radpad/rules.mk
+++ b/keyboards/keybage/radpad/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
index 75655f2bd5..ef4f0c0b43 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
+++ b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
@@ -8,4 +7,3 @@ RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 # This does not affect QMK Macros and Layers
 LTO_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
index 0229490d44..96b99cdff0 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = no      # Disable keyboard RGB underglow
@@ -18,4 +17,3 @@ SPLIT_KEYBOARD = yes
 #DEACTIVATED FOR MEMORY SAVING
 MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
index 9ce6e078db..dc3e29cf8b 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 COMBO_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/rev3/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
index e72f11863f..5ec06e9609 100644
--- a/keyboards/keycapsss/plaid_pad/rev3/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
@@ -1,3 +1,2 @@
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
diff --git a/keyboards/kikoslab/kl90/rules.mk b/keyboards/kikoslab/kl90/rules.mk
index 27c445ca2f..a62bc3d00c 100644
--- a/keyboards/kikoslab/kl90/rules.mk
+++ b/keyboards/kikoslab/kl90/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
index eee9c0d533..68d3197896 100755
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
+++ b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
@@ -1,4 +1,3 @@
 VIA_ENABLE = yes
 BOOTLOADER = qmk-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/kingly_keys/romac_plus/rules.mk b/keyboards/kingly_keys/romac_plus/rules.mk
index a2287ae915..3eef56841c 100644
--- a/keyboards/kingly_keys/romac_plus/rules.mk
+++ b/keyboards/kingly_keys/romac_plus/rules.mk
@@ -10,4 +10,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable support for EC11 Rotary Encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk b/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk
+++ b/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/knobgoblin/rules.mk b/keyboards/knobgoblin/rules.mk
index e19365e2ab..41cfa4949a 100644
--- a/keyboards/knobgoblin/rules.mk
+++ b/keyboards/knobgoblin/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/latincompass/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk
index 4d41664e3c..c6959a6590 100644
--- a/keyboards/latincompass/latinpad/rules.mk
+++ b/keyboards/latincompass/latinpad/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/lefty/rules.mk b/keyboards/lefty/rules.mk
index e0d5a4375e..bbf738e03b 100644
--- a/keyboards/lefty/rules.mk
+++ b/keyboards/lefty/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 DEFAULT_FOLDER = lefty/rev2
diff --git a/keyboards/lily58/keymaps/drasbeck/rules.mk b/keyboards/lily58/keymaps/drasbeck/rules.mk
index 10228e3677..f0442f1008 100644
--- a/keyboards/lily58/keymaps/drasbeck/rules.mk
+++ b/keyboards/lily58/keymaps/drasbeck/rules.mk
@@ -13,7 +13,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # OLED display
 ENCODER_ENABLE = yes        # Enable encoder
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/lily58/keymaps/gshmu/rules.mk b/keyboards/lily58/keymaps/gshmu/rules.mk
index 4b7da61a0c..401abfb4cf 100644
--- a/keyboards/lily58/keymaps/gshmu/rules.mk
+++ b/keyboards/lily58/keymaps/gshmu/rules.mk
@@ -1,6 +1,5 @@
 VIA_ENABLE = yes
 OLED_ENABLE = no
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 DYNAMIC_TAPPING_TERM_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/mb_via/rules.mk b/keyboards/lily58/keymaps/mb_via/rules.mk
index d3528d52a1..3c1f402d2a 100644
--- a/keyboards/lily58/keymaps/mb_via/rules.mk
+++ b/keyboards/lily58/keymaps/mb_via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/muuko/rules.mk b/keyboards/lily58/keymaps/muuko/rules.mk
index 7c38d43f82..004fc910f6 100644
--- a/keyboards/lily58/keymaps/muuko/rules.mk
+++ b/keyboards/lily58/keymaps/muuko/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 COMBO_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk
index b7c57d87b9..9f00574d5d 100644
--- a/keyboards/lily58/keymaps/ninjonas/rules.mk
+++ b/keyboards/lily58/keymaps/ninjonas/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/via/rules.mk b/keyboards/lily58/keymaps/via/rules.mk
index d3528d52a1..3c1f402d2a 100644
--- a/keyboards/lily58/keymaps/via/rules.mk
+++ b/keyboards/lily58/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/yuchi/config.h b/keyboards/lily58/keymaps/yuchi/config.h
index 8e07ec837f..55d05464bc 100644
--- a/keyboards/lily58/keymaps/yuchi/config.h
+++ b/keyboards/lily58/keymaps/yuchi/config.h
@@ -28,7 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
-//#define OLED_DRIVER
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 100
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk
index 76ce166170..a63bd42ad3 100644
--- a/keyboards/lily58/rules.mk
+++ b/keyboards/lily58/rules.mk
@@ -1,3 +1 @@
-OLED_DRIVER = SSD1306
 DEFAULT_FOLDER = lily58/rev1
diff --git a/keyboards/lime/rev1/rules.mk b/keyboards/lime/rev1/rules.mk
index f83c13ac8d..8ef96fa9d0 100644
--- a/keyboards/lime/rev1/rules.mk
+++ b/keyboards/lime/rev1/rules.mk
@@ -1,4 +1,3 @@
 ENCODER_ENABLE = yes
 ENCODER_RIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/ll3macorn/bongopad/rules.mk b/keyboards/ll3macorn/bongopad/rules.mk
index c7f8935a08..722f12e66e 100644
--- a/keyboards/ll3macorn/bongopad/rules.mk
+++ b/keyboards/ll3macorn/bongopad/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+WPM_ENABLE = yes
-WPM_ENABLE = yes
-\ No newline at end of file
diff --git a/keyboards/lyso1/lck75/rules.mk b/keyboards/lyso1/lck75/rules.mk
index db42ab6247..6f3aabc44f 100644
--- a/keyboards/lyso1/lck75/rules.mk
+++ b/keyboards/lyso1/lck75/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 WPM_ENABLE = yes
 LTO_ENABLE = no
diff --git a/keyboards/macrocat/keymaps/oled/rules.mk b/keyboards/macrocat/keymaps/oled/rules.mk
index ca8d16ba67..ab9d5c6ac2 100644
--- a/keyboards/macrocat/keymaps/oled/rules.mk
+++ b/keyboards/macrocat/keymaps/oled/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-\ No newline at end of file
diff --git a/keyboards/marksard/treadstone48/keymaps/default/rules.mk b/keyboards/marksard/treadstone48/keymaps/default/rules.mk
index 23c4ae9542..4ce2645eca 100644
--- a/keyboards/marksard/treadstone48/keymaps/default/rules.mk
+++ b/keyboards/marksard/treadstone48/keymaps/default/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 # If you want to change the display of OLED, you need to change here
diff --git a/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
index 23c4ae9542..4ce2645eca 100644
--- a/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 # If you want to change the display of OLED, you need to change here
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
index fafe992d6f..6b041a7554 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 # If you use connection the Rhymestone, please enable RS_EXTRA_LED
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index 78219bface..e9a2de4c25 100644
--- a/keyboards/marksard/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -14,6 +14,5 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 DEFAULT_FOLDER = marksard/treadstone48/rev1
diff --git a/keyboards/mechllama/g35/rules.mk b/keyboards/mechllama/g35/rules.mk
index 205f587238..be2e71f903 100644
--- a/keyboards/mechllama/g35/rules.mk
+++ b/keyboards/mechllama/g35/rules.mk
@@ -1,6 +1,5 @@
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 RGBLIGHT_ENABLE = yes
 DEFAULT_FOLDER = mechllama/g35/v2
diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk
index 540fbaecb2..6cdd598124 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk
+++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk
@@ -8,6 +8,5 @@ LEADER_ENABLE     = yes
 ENCODER_ENABLE    = yes
 ENCODER_MAP_ENABLE = yes
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Set OLED Driver
-RGBLIGHT_ENABLE   = yes     # Enable keyboard RGB underglow
-\ No newline at end of file
+RGBLIGHT_ENABLE   = yes     # Enable keyboard RGB underglow
diff --git a/keyboards/mechwild/bde/rev2/rules.mk b/keyboards/mechwild/bde/rev2/rules.mk
index 307b1ef797..bade0749fc 100644
--- a/keyboards/mechwild/bde/rev2/rules.mk
+++ b/keyboards/mechwild/bde/rev2/rules.mk
@@ -1,3 +1,2 @@
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Set OLED Driver
diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk
index 27c445ca2f..a62bc3d00c 100644
--- a/keyboards/mechwild/mercutio/rules.mk
+++ b/keyboards/mechwild/mercutio/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk
index c04e6937b0..875d431168 100644
--- a/keyboards/mechwild/mokulua/mirrored/rules.mk
+++ b/keyboards/mechwild/mokulua/mirrored/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Define OLED Driver
+SPLIT_KEYBOARD = yes        # Define split functionality
-SPLIT_KEYBOARD = yes        # Define split functionality
-\ No newline at end of file
diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk
index c04e6937b0..875d431168 100644
--- a/keyboards/mechwild/mokulua/standard/rules.mk
+++ b/keyboards/mechwild/mokulua/standard/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Define OLED Driver
+SPLIT_KEYBOARD = yes        # Define split functionality
-SPLIT_KEYBOARD = yes        # Define split functionality
-\ No newline at end of file
diff --git a/keyboards/mechwild/murphpad/rules.mk b/keyboards/mechwild/murphpad/rules.mk
index ddfffd4c4b..df9b208bb2 100644
--- a/keyboards/mechwild/murphpad/rules.mk
+++ b/keyboards/mechwild/murphpad/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable OLED Screen
diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk
index 4bddc4813f..980fe281cf 100644
--- a/keyboards/mechwild/puckbuddy/rules.mk
+++ b/keyboards/mechwild/puckbuddy/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Encoder Enabled
 OLED_ENABLE = yes           # OLED Enabled
-OLED_DRIVER = SSD1306       # OLED Driver
 DIP_SWITCH_ENABLE = yes     # Dip Switch Enabled
 POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk
index 05ac15827c..9cfa6b7797 100644
--- a/keyboards/mechwild/sugarglider/rules.mk
+++ b/keyboards/mechwild/sugarglider/rules.mk
@@ -2,7 +2,6 @@
 #   change yes to no to disable
 #
 OLED_ENABLE = yes                   # OLED Enabled
-OLED_DRIVER = SSD1306               # OLED Driver
 # Cirque touchpad settings
 POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
diff --git a/keyboards/meow48/rules.mk b/keyboards/meow48/rules.mk
index b38f37579e..50a1438ecd 100644
--- a/keyboards/meow48/rules.mk
+++ b/keyboards/meow48/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-\ No newline at end of file
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
index de0aec2ab2..11776618e2 100644
--- a/keyboards/merge/um70/rules.mk
+++ b/keyboards/merge/um70/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk
index de0aec2ab2..11776618e2 100644
--- a/keyboards/merge/um80/rules.mk
+++ b/keyboards/merge/um80/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk
index 1fec8e4215..8bd01d2bb4 100644
--- a/keyboards/merge/uma/rules.mk
+++ b/keyboards/merge/uma/rules.mk
@@ -14,4 +14,3 @@ ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/mino_plus/hotswap/rules.mk b/keyboards/mino_plus/hotswap/rules.mk
index 842350f40e..76e55c05f4 100644
--- a/keyboards/mino_plus/hotswap/rules.mk
+++ b/keyboards/mino_plus/hotswap/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
 WPM_ENABLE = yes
-OLED_DRIVER = SSD1306
-\ No newline at end of file
diff --git a/keyboards/mino_plus/soldered/rules.mk b/keyboards/mino_plus/soldered/rules.mk
index 842350f40e..76e55c05f4 100644
--- a/keyboards/mino_plus/soldered/rules.mk
+++ b/keyboards/mino_plus/soldered/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
 WPM_ENABLE = yes
-OLED_DRIVER = SSD1306
-\ No newline at end of file
diff --git a/keyboards/misonoworks/chocolatebar/rules.mk b/keyboards/misonoworks/chocolatebar/rules.mk
index de4cbe598c..e61a4270e1 100644
--- a/keyboards/misonoworks/chocolatebar/rules.mk
+++ b/keyboards/misonoworks/chocolatebar/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk
index bf9405e1d1..3e44c80fe0 100644
--- a/keyboards/mlego/m65/rev4/rules.mk
+++ b/keyboards/mlego/m65/rev4/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 ENCODER_ENABLE = yes       # Enable encoder
 OLED_ENABLE = yes          # Enable OLED
-OLED_DRIVER = SSD1306      # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 WPM_ENABLE = yes           # Enable WPM Counter 
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk b/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
index db6a98385a..1909c7ef9a 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk b/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk
index 0e39ada47b..d665c5ec5a 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk b/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk
index 7e580bfd74..5706b9bf2a 100644
--- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk b/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk
index d0a184e961..506f77c16d 100644
--- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/keymaps/oled/rules.mk b/keyboards/nullbitsco/snap/keymaps/oled/rules.mk
index d0a184e961..506f77c16d 100644
--- a/keyboards/nullbitsco/snap/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/oled/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk b/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
index 151e44f4aa..16bd6085c0 100644
--- a/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
index 1b3509eac8..ba3a7b1701 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
@@ -1,4 +1,3 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk
index e2392b1293..7d311cd405 100644
--- a/keyboards/obosob/arch_36/rules.mk
+++ b/keyboards/obosob/arch_36/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enables the use of OLED displays
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes       # Split common
diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk
index 1c07ca71f2..8876586f4b 100644
--- a/keyboards/palette1202/rules.mk
+++ b/keyboards/palette1202/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE    = no     # Enable keyboard RGB underglow
 AUDIO_ENABLE       = no     # Audio output
 ENCODER_ENABLE     = yes    # Enable support for rotary encoders
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable support for OLED display
 # Additional code
 SRC += lib/oled_helper.c  # Adding OLED
diff --git a/keyboards/pearlboards/zeuspad/rules.mk b/keyboards/pearlboards/zeuspad/rules.mk
index c6e9db406a..a560cb2ea2 100644
--- a/keyboards/pearlboards/zeuspad/rules.mk
+++ b/keyboards/pearlboards/zeuspad/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Rotary encoder
 OLED_ENABLE = yes           # Enable oled
-OLED_DRIVER = SSD1306       # Oled type
 LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/pica40/rev1/rules.mk b/keyboards/pica40/rev1/rules.mk
index 2e3ef9fb84..e69de29bb2 100644
--- a/keyboards/pica40/rev1/rules.mk
+++ b/keyboards/pica40/rev1/rules.mk
@@ -1 +0,0 @@
-OLED_DRIVER = SSD1306
diff --git a/keyboards/planck/keymaps/rootiest/rules.mk b/keyboards/planck/keymaps/rootiest/rules.mk
index ca0f90b6e9..d6f42b33ad 100644
--- a/keyboards/planck/keymaps/rootiest/rules.mk
+++ b/keyboards/planck/keymaps/rootiest/rules.mk
@@ -1,7 +1,6 @@
 SRC += muse.c
 ENCODER_ENABLE = yes # Enables basic encoder support
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306 # Enables support for OLED displays
 # UNICODE_ENABLE = yes # Allow inputting basic unicode characters
 UNICODEMAP_ENABLE = yes # Enable use of Unicode mapping array
 # UCIS_ENABLE = yes # Another method for generating Unicode characters via maps
diff --git a/keyboards/prototypist/oceanographer/rules.mk b/keyboards/prototypist/oceanographer/rules.mk
index 07ce0fe6c5..5f37eac2f6 100644
--- a/keyboards/prototypist/oceanographer/rules.mk
+++ b/keyboards/prototypist/oceanographer/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 AUDIO_ENABLE = yes
 LTO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/rainkeebs/rainkeeb/rules.mk b/keyboards/rainkeebs/rainkeeb/rules.mk
index ed4adffba9..866521b428 100644
--- a/keyboards/rainkeebs/rainkeeb/rules.mk
+++ b/keyboards/rainkeebs/rainkeeb/rules.mk
@@ -13,7 +13,6 @@ RGBLIGHT_ENABLE = no
 # OLED enable
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # Encoder enable
 ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rart67m/rules.mk b/keyboards/rart/rart67m/rules.mk
index 9d9090d7ea..5a309870d3 100644
--- a/keyboards/rart/rart67m/rules.mk
+++ b/keyboards/rart/rart67m/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/rart/rart75m/rules.mk b/keyboards/rart/rart75m/rules.mk
index 6d03cffdfe..5277f7c480 100644
--- a/keyboards/rart/rart75m/rules.mk
+++ b/keyboards/rart/rart75m/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rartand/rules.mk b/keyboards/rart/rartand/rules.mk
index b9cc25d86e..7b55e77aee 100644
--- a/keyboards/rart/rartand/rules.mk
+++ b/keyboards/rart/rartand/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk
index 06d9ea1b91..5e5e0f090d 100644
--- a/keyboards/rart/rartland/rules.mk
+++ b/keyboards/rart/rartland/rules.mk
@@ -15,5 +15,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk
index 47297d817f..b3f4fc8b8a 100644
--- a/keyboards/rart/rartlice/rules.mk
+++ b/keyboards/rart/rartlice/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/rate/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk
index df27be46be..7d8b50ef3f 100644
--- a/keyboards/rate/pistachio_pro/rules.mk
+++ b/keyboards/rate/pistachio_pro/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CUSTOM_MATRIX = lite
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 0862bde4e5..18dfc8edf7 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -19,7 +19,6 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver
 ENCODER_ENABLE = yes
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
index 775fa48e12..3f1097a7e8 100644
--- a/keyboards/rgbkb/pan/rules.mk
+++ b/keyboards/rgbkb/pan/rules.mk
@@ -11,7 +11,6 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # RGB layout selection
 RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
index 073cb668f0..36416c8dbe 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
@@ -24,7 +24,6 @@ IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPa
 DEFAULT_FOLDER = rgbkb/sol/rev1
 ENCODER_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # Do not edit past here
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 382b858f46..9cb54cfa15 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -23,7 +23,6 @@ RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver
 ENCODER_ENABLE = yes
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default/readme.md b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
index e3e663db5d..e1984691c6 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
+++ b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
@@ -97,10 +97,7 @@ RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited t
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 ENCODER_ENABLE = yes        # Enable rotary encoder (+90)
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver (+5000)
 IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
 ```
 ## Compile
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
index 2eb5fbab49..aa8c432646 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
@@ -11,7 +11,6 @@ RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited t
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 ENCODER_ENABLE = yes        # Enable rotary encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver
 IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
 LTO_ENABLE = yes     # Enable optimizations to reduce firmware size. Also disables action macros and functions.
diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk
index cb202f5b9b..13002485f8 100644
--- a/keyboards/ristretto/rules.mk
+++ b/keyboards/ristretto/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WAIT_FOR_USB = yes
diff --git a/keyboards/rmi_kb/herringbone/pro/rules.mk b/keyboards/rmi_kb/herringbone/pro/rules.mk
index db45e4f61c..890f20de86 100644
--- a/keyboards/rmi_kb/herringbone/pro/rules.mk
+++ b/keyboards/rmi_kb/herringbone/pro/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk
index 110ba7d10a..dcc3d4516b 100644
--- a/keyboards/rocketboard_16/rules.mk
+++ b/keyboards/rocketboard_16/rules.mk
@@ -17,7 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB backlit keys
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RAW_ENABLE = yes            # Enables HID RAW communication between the board and the PC
diff --git a/keyboards/rubi/rules.mk b/keyboards/rubi/rules.mk
index e2279a08a6..e481073044 100644
--- a/keyboards/rubi/rules.mk
+++ b/keyboards/rubi/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 SRC += lib/oled.c \
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index 0f2fb66a80..1c7bdc0c3c 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk b/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
+++ b/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
index 69864a3166..ad721c13de 100644
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
@@ -1,4 +1,3 @@
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
index 687d594ecb..fe692cc5c3 100644
--- a/keyboards/satt/comet46/rules.mk
+++ b/keyboards/satt/comet46/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
-OLED_DRIVER = SSD1306
 # project specific files
 SRC += matrix.c
diff --git a/keyboards/sendyyeah/pix/rules.mk b/keyboards/sendyyeah/pix/rules.mk
index a6fe4b81c4..83231e1022 100644
--- a/keyboards/sendyyeah/pix/rules.mk
+++ b/keyboards/sendyyeah/pix/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/shoc/rules.mk b/keyboards/shoc/rules.mk
index 806df50421..5d17ed9492 100644
--- a/keyboards/shoc/rules.mk
+++ b/keyboards/shoc/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk
index bb1a7f3dc2..00719ebea0 100755
--- a/keyboards/sofle/keyhive/rules.mk
+++ b/keyboards/sofle/keyhive/rules.mk
@@ -14,4 +14,3 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/default/rules.mk b/keyboards/sofle/keymaps/default/rules.mk
index c21a769a2e..ab79c07969 100644
--- a/keyboards/sofle/keymaps/default/rules.mk
+++ b/keyboards/sofle/keymaps/default/rules.mk
@@ -1,6 +1,5 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/devdev/rules.mk b/keyboards/sofle/keymaps/devdev/rules.mk
index 860c2122da..0d18161a0d 100644
--- a/keyboards/sofle/keymaps/devdev/rules.mk
+++ b/keyboards/sofle/keymaps/devdev/rules.mk
@@ -5,4 +5,3 @@ RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/flare576/rules.mk b/keyboards/sofle/keymaps/flare576/rules.mk
index a7505f5386..abfcc01d94 100644
--- a/keyboards/sofle/keymaps/flare576/rules.mk
+++ b/keyboards/sofle/keymaps/flare576/rules.mk
@@ -3,5 +3,4 @@ ENCODER_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 WPM_ENABLE = yes
-OLED_DRIVER_ENABLE = yes
 SRC += graphics.c
diff --git a/keyboards/sofle/keymaps/helltm/rules.mk b/keyboards/sofle/keymaps/helltm/rules.mk
index b905bd94fc..8cba530959 100644
--- a/keyboards/sofle/keymaps/helltm/rules.mk
+++ b/keyboards/sofle/keymaps/helltm/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = yes
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/michal/rules.mk b/keyboards/sofle/keymaps/michal/rules.mk
index 8088d744cd..06a046f073 100644
--- a/keyboards/sofle/keymaps/michal/rules.mk
+++ b/keyboards/sofle/keymaps/michal/rules.mk
@@ -1,7 +1,6 @@
 BOOTLOADER = atmel-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # These are turned off to save space
 COMMAND_ENABLE = no
@@ -17,4 +16,4 @@ EXTRAKEY_ENABLE = yes
 MOUSEKEY_ENABLE = yes
 # More space-saving
-LTO_ENABLE = yes
-\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/noqmk/rules.mk b/keyboards/sofle/keymaps/noqmk/rules.mk
index 6685b8492c..5881392622 100644
--- a/keyboards/sofle/keymaps/noqmk/rules.mk
+++ b/keyboards/sofle/keymaps/noqmk/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/rgb_default/rules.mk b/keyboards/sofle/keymaps/rgb_default/rules.mk
index 860c2122da..0d18161a0d 100644
--- a/keyboards/sofle/keymaps/rgb_default/rules.mk
+++ b/keyboards/sofle/keymaps/rgb_default/rules.mk
@@ -5,4 +5,3 @@ RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/via/rules.mk b/keyboards/sofle/keymaps/via/rules.mk
index b57a417092..c8ca49919c 100644
--- a/keyboards/sofle/keymaps/via/rules.mk
+++ b/keyboards/sofle/keymaps/via/rules.mk
@@ -1,9 +1,8 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no
 EXTRAKEY_ENABLE = yes
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
-\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/sofle/rev1/rules.mk b/keyboards/sofle/rev1/rules.mk
index 46ec39ee48..5ec06e9609 100644
--- a/keyboards/sofle/rev1/rules.mk
+++ b/keyboards/sofle/rev1/rules.mk
@@ -1,3 +1,2 @@
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/spaceman/pancake/rev2/rules.mk b/keyboards/spaceman/pancake/rev2/rules.mk
index c085de5a4a..a7cc2bfee4 100644
--- a/keyboards/spaceman/pancake/rev2/rules.mk
+++ b/keyboards/spaceman/pancake/rev2/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/spacetime/rev2/rules.mk b/keyboards/spacetime/rev2/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/spacetime/rev2/rules.mk
+++ b/keyboards/spacetime/rev2/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/spleeb/keymaps/chrishoage/rules.mk b/keyboards/spleeb/keymaps/chrishoage/rules.mk
index 117c55fd8b..271c920da8 100644
--- a/keyboards/spleeb/keymaps/chrishoage/rules.mk
+++ b/keyboards/spleeb/keymaps/chrishoage/rules.mk
@@ -8,4 +8,3 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
index b1c72a8aaf..585c589d3a 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
+++ b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
@@ -7,7 +7,6 @@ SRC += features/leader.c
 SRC += oled/oled.c
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
 AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk b/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
index 65b44a2982..a64a9f4e15 100644
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 LEADER_ENABLE = yes        # Enable the Leader Key feature
diff --git a/keyboards/splitkb/kyria/keymaps/benji/rules.mk b/keyboards/splitkb/kyria/keymaps/benji/rules.mk
index 35f8ec90c6..7b3d230350 100644
--- a/keyboards/splitkb/kyria/keymaps/benji/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/benji/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/rules.mk b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/rules.mk
index e7146a1640..c58bda2c50 100644
--- a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/rules.mk
@@ -1,7 +1,6 @@
 BOOTMAGIC_ENABLE = no
 BOOTLOADER = atmel-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = no      # Enable keyboard RGB underglow
 COMMAND_ENABLE = no # Disables the command feature
@@ -11,4 +10,3 @@ CONSOLE_ENABLE = no
 AUDIO_ENABLE = no
 CAPS_WORD_ENABLE = yes
 CUSTOM_ONESHOT_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk b/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk
index 71feb286da..968012ece1 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk
@@ -3,5 +3,4 @@ EXTRAKEY_ENABLE    = yes
 LEADER_ENABLE      = yes
 MOUSEKEY_ENABLE    = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 RGBLIGHT_ENABLE    = no
diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk b/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
index 59e2da986b..2ed0ad91c7 100644
--- a/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
@@ -1,5 +1,4 @@
 # OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 # ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 LEADER_ENABLE = yes        # Enables the Leader shortcut funtionality
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk b/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk
index e2e6a32689..442170ccd6 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 RAW_ENABLE = no
 WPM_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/default/rules.mk b/keyboards/splitkb/kyria/keymaps/default/rules.mk
index 8301073511..36a9c31373 100644
--- a/keyboards/splitkb/kyria/keymaps/default/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/default/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306      # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGB_MATRIX_ENABLE = no     # Disable keyboard RGB matrix, as it is enabled by default on rev3
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk b/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
index d5d64865bb..d1f3f0f9f4 100644
--- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUTO_SHIFT_ENABLE = yes    # Enable auto shift
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
index be3789ce9b..eff9494ff1 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
@@ -3,7 +3,6 @@ ENCODER_ENABLE     = yes  # ENables the use of one or more encoders
 RGBLIGHT_ENABLE    = yes  # Enable keyboard RGB underglow
 MOUSEKEY_ENABLE    = no   # Mouse keys
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306  # Enables the use of OLED displays
 THUMBSTICK_ENABLE  = yes  # Enables analog thumbstick code
 ifeq ($(strip $(ENCODER_ENABLE)), yes)
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
index 453d19ab3b..7bcef000f3 100644
--- a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 WPM_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk b/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
index a987a4ded2..21b26a04a4 100644
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
@@ -1,6 +1,5 @@
 AUTO_SHIFT_ENABLE = yes # Autoshift by holding down a key
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = no      # Enable keyboard RGB underglow
 LEADER_ENABLE = no        # Enable the Leader Key feature
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk b/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
index 35f8ec90c6..7b3d230350 100644
--- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
index 87026b8756..802e7a0f8a 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes          # Enables the use of OLED displays
-OLED_DRIVER = SSD1306
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 NKRO_ENABLE = yes          # Enable N-Key Rollover
 ENCODER_ENABLE = no        # Disable Rotary Encoder
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk b/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
index 329b41e4e5..61577a39a5 100644
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
@@ -2,7 +2,6 @@ BOOTLOADER         = caterina  # Pro Micro bootloader
 TAP_DANCE_ENABLE   = yes       # Enable Tap Dance
-OLED_DRIVER_ENABLE = yes       # Enables the use of OLED displays
 ENCODER_ENABLE     = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE    = yes       # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/lw/rules.mk b/keyboards/splitkb/kyria/keymaps/lw/rules.mk
index 41156dd41c..36553b7b25 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/lw/rules.mk
@@ -1,6 +1,5 @@
 OLED_ENABLE = no 
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = no     # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
-UNICODEMAP_ENABLE = yes # Enable unicode 
-\ No newline at end of file
+UNICODEMAP_ENABLE = yes # Enable unicode 
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk b/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
index f37eabe3d5..2f8de3561e 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = no       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-MOUSEKEY_ENABLE = yes    # Enable mouse movements
-\ No newline at end of file
+MOUSEKEY_ENABLE = yes    # Enable mouse movements
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/rules.mk b/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
index 9d1a91831e..2a9ca4aff9 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 LEADER_ENABLE = yes        # Enables the use of the leader key
diff --git a/keyboards/splitkb/kyria/keymaps/ninjonas/rules.mk b/keyboards/splitkb/kyria/keymaps/ninjonas/rules.mk
index 1931861caf..9d1a8a631e 100644
--- a/keyboards/splitkb/kyria/keymaps/ninjonas/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/ninjonas/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 LTO_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk b/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
index 4d148481ca..f35aee8683 100644
--- a/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 LEADER_ENABLE = yes        # Enable the Leader Key feature
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/rules.mk b/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
index 35f8ec90c6..7b3d230350 100644
--- a/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk b/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
index e79a5604e0..7fe734fb72 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk b/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
index 65b44a2982..a64a9f4e15 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 LEADER_ENABLE = yes        # Enable the Leader Key feature
diff --git a/keyboards/splitkb/kyria/keymaps/travishi/rules.mk b/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
index a1564cfe4b..398b5debfa 100644
--- a/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
@@ -2,11 +2,10 @@
 LEADER_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 WPM_ENABLE = yes
 # Disabled features
 ENCODER_ENABLE = no       # Enables the use of one or more encoders
-MOUSEKEY_ENABLE = no
-\ No newline at end of file
+MOUSEKEY_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/via/rules.mk b/keyboards/splitkb/kyria/keymaps/via/rules.mk
index 0f12ae88e1..351b074027 100644
--- a/keyboards/splitkb/kyria/keymaps/via/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 VIA_ENABLE = yes
 NKRO_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk b/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
index 47a3988e6e..c09579035c 100755
--- a/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more
 NKRO_ENABLE = yes
 WPM_ENABLE = yes
diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk
index f491893a43..3bcfccdd7b 100644
--- a/keyboards/splitkb/zima/rules.mk
+++ b/keyboards/splitkb/zima/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = yes         # Audio output
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306      # Enables the use of OLED displays
 HAPTIC_ENABLE = yes        # Supported but not included by defaut
 HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/subrezon/la_nc/keymaps/default/rules.mk b/keyboards/subrezon/la_nc/keymaps/default/rules.mk
index b7c57d87b9..9f00574d5d 100644
--- a/keyboards/subrezon/la_nc/keymaps/default/rules.mk
+++ b/keyboards/subrezon/la_nc/keymaps/default/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/takashicompany/endzone34/rules.mk b/keyboards/takashicompany/endzone34/rules.mk
index f8fbdec9bd..e6ed3b4b03 100644
--- a/keyboards/takashicompany/endzone34/rules.mk
+++ b/keyboards/takashicompany/endzone34/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/takashicompany/minizone/rules.mk b/keyboards/takashicompany/minizone/rules.mk
index 60c7bb59b5..e6ed3b4b03 100644
--- a/keyboards/takashicompany/minizone/rules.mk
+++ b/keyboards/takashicompany/minizone/rules.mk
@@ -10,6 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-\ No newline at end of file
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
index f27ee2a28e..0001ae06b8 100644
--- a/keyboards/tau4/rules.mk
+++ b/keyboards/tau4/rules.mk
@@ -1,7 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-OLED_DRIVER = SSD1306    # OLED display support
 # EEPROM_DRIVER ?= i2c        # Driver for external EEPROM chip
 # This is currently not working due to QMK not officially supporting the chip used on the Tau4, I am working on a fix.
diff --git a/keyboards/tender/macrowo_pad/keymaps/default/rules.mk b/keyboards/tender/macrowo_pad/keymaps/default/rules.mk
index fd3d5d7e56..dd68e9d3b0 100644
--- a/keyboards/tender/macrowo_pad/keymaps/default/rules.mk
+++ b/keyboards/tender/macrowo_pad/keymaps/default/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/tender/macrowo_pad/keymaps/via/rules.mk b/keyboards/tender/macrowo_pad/keymaps/via/rules.mk
index d3ac2585b9..ab9d5c6ac2 100644
--- a/keyboards/tender/macrowo_pad/keymaps/via/rules.mk
+++ b/keyboards/tender/macrowo_pad/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/tkc/m0lly/rules.mk b/keyboards/tkc/m0lly/rules.mk
index f07afe6ed4..6d915f6d41 100644
--- a/keyboards/tkc/m0lly/rules.mk
+++ b/keyboards/tkc/m0lly/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/tkc/tkc1800/rules.mk b/keyboards/tkc/tkc1800/rules.mk
index f9f3b206d0..fc74989daf 100644
--- a/keyboards/tkc/tkc1800/rules.mk
+++ b/keyboards/tkc/tkc1800/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 2565f116a1..86483ba920 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -16,7 +16,6 @@ KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+m
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk
index 7d7b301589..d2ec5cf6d4 100644
--- a/keyboards/torn/rules.mk
+++ b/keyboards/torn/rules.mk
@@ -10,7 +10,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes        # Enable rotary encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 CUSTOM_MATRIX = lite
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 5b696a9b07..9354144466 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 MIDI_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 SPACE_CADET_ENABLE = no
diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk
index 4f359b9ee8..0eed9cdd8f 100644
--- a/keyboards/waterfowl/rules.mk
+++ b/keyboards/waterfowl/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes        # Enables the use of OLED displays
-OLED_DRIVER = SSD1306    # Specifies the type of OLED
 SPLIT_KEYBOARD = yes     # Enables split functionality
-ENCODER_ENABLE = yes     # Enables the encoders
-\ No newline at end of file
+ENCODER_ENABLE = yes     # Enables the encoders
diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/westm/westm9/rules.mk
index 00ce09e1a6..e522c52560 100644
--- a/keyboards/westm/westm9/rules.mk
+++ b/keyboards/westm/westm9/rules.mk
@@ -15,6 +15,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes                       # Enable the OLED feature
-OLED_DRIVER = SSD1306           # OLED driver
 DEFAULT_FOLDER = westm/westm9/rev2
diff --git a/keyboards/yampad/rules.mk b/keyboards/yampad/rules.mk
index 5d58ddf6fa..498bf77b97 100644
--- a/keyboards/yampad/rules.mk
+++ b/keyboards/yampad/rules.mk
@@ -10,6 +10,5 @@ EXTRAKEY_ENABLE = no        # Audio control and System control
 LTO_ENABLE = yes            # Link time optimise, reduce firmware size
 MOUSEKEY_ENABLE = no        # Mouse keys
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-OLED_DRIVER = SSD1306
 OLED_ENABLE = yes
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk
index 651d6bedf3..014f5d4d42 100644
--- a/keyboards/yanghu/unicorne/rules.mk
+++ b/keyboards/yanghu/unicorne/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/yosino58/rev1/rules.mk b/keyboards/yosino58/rev1/rules.mk
index a51a58c5ea..2fcc81da0f 100644
--- a/keyboards/yosino58/rev1/rules.mk
+++ b/keyboards/yosino58/rev1/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SPLIT_KEYBOARD = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/z12/rules.mk b/keyboards/z12/rules.mk
index 65ce7f2dea..102b2e62a3 100644
--- a/keyboards/z12/rules.mk
+++ b/keyboards/z12/rules.mk
@@ -13,5 +13,3 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 LTO_ENABLE = yes           # Enables Link Time Optimization (LTO) which reduces the compiled size
 OLED_ENABLE = yes          # Enables the use of OLED displays
-OLED_DRIVER = SSD1306      # Enables the use of OLED displays
diff --git a/layouts/community/split_3x6_3/bcat/rules.mk b/layouts/community/split_3x6_3/bcat/rules.mk
index 29e52b92db..e0ce760a79 100644
--- a/layouts/community/split_3x6_3/bcat/rules.mk
+++ b/layouts/community/split_3x6_3/bcat/rules.mk
@@ -4,6 +4,5 @@ ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
        BOOTLOADER = atmel-dfu  # Elite-C
        OLED_ENABLE = yes  # dual 128x32 OLED screens
-        OLED_DRIVER = SSD1306
        RGB_MATRIX_ENABLE = yes  # per-key RGB and underglow
 endif
diff --git a/users/snowe/readme_ocean_dream.md b/users/snowe/readme_ocean_dream.md
index 688afc8998..fd6de1bca7 100644
--- a/users/snowe/readme_ocean_dream.md
+++ b/users/snowe/readme_ocean_dream.md
@@ -60,7 +60,6 @@ endif
 You're done! Now you can enable **Ocean Dream** by simply turning on the OLED feature
 ```makefile
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ```
 And if you want to disable it without turning off the OLED Driver you can simply set 
diff --git a/users/tominabox1/rules.mk b/users/tominabox1/rules.mk
index 1df5634640..f1ee5c0485 100644
--- a/users/tominabox1/rules.mk
+++ b/users/tominabox1/rules.mk
@@ -12,7 +12,6 @@ RGB_MATRIX_ENABLE = yes
 EXTRAFLAGS += -flto
 BOOTLOADER = qmk-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 endif
 ifeq ($(strip $(KEYBOARD)), lazydesigners/dimple)
author	Ryan <fauxpark@gmail.com>	2023-08-15 19:30:34 +1000
committer	GitHub <noreply@github.com>	2023-08-15 10:30:34 +0100
commit	5d2f2af19897d1f5fd35cb8475fc8b3f74f201f1 (patch)
tree	4e2a8b21bd41dc036a91562b4f25257d5b8701e0
parent	0ac8221a0a423d1a74238fcdf6b489bfe865c2e7 (diff)