From eb2db05e8a7338568fea43b05822aa8089524f61 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 13 Sep 2023 13:45:49 +0100 Subject: [PATCH] Migrate spi EEPROM_DRIVER to info.json (#21991) --- keyboards/bastardkb/charybdis/3x5/blackpill/info.json | 3 +++ keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk | 1 - keyboards/bastardkb/charybdis/3x6/blackpill/info.json | 3 +++ keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk | 1 - keyboards/bastardkb/charybdis/4x6/blackpill/info.json | 3 +++ keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk | 1 - keyboards/bastardkb/scylla/blackpill/info.json | 3 +++ keyboards/bastardkb/scylla/blackpill/rules.mk | 1 - keyboards/bastardkb/skeletyl/blackpill/info.json | 3 +++ keyboards/bastardkb/skeletyl/blackpill/rules.mk | 1 - keyboards/bastardkb/tbkmini/blackpill/info.json | 3 +++ keyboards/bastardkb/tbkmini/blackpill/rules.mk | 1 - keyboards/custommk/ergostrafer/info.json | 3 +++ keyboards/custommk/ergostrafer/rules.mk | 2 -- keyboards/custommk/evo70_r2/info.json | 3 +++ keyboards/custommk/evo70_r2/rules.mk | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk | 1 - keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk | 1 - keyboards/tzarc/djinn/info.json | 3 +++ keyboards/tzarc/djinn/rules.mk | 2 -- keyboards/tzarc/ghoul/info.json | 3 +++ keyboards/tzarc/ghoul/rules.mk | 1 - 24 files changed, 36 insertions(+), 15 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index 89e181b8f9..a20b2ce636 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "eeprom": { + "driver": "spi" + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index 9cc216bb71..4bd570ddd8 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -23,5 +23,4 @@ POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 5ac7a1cdca..bda53275f8 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "eeprom": { + "driver": "spi" + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index 9cc216bb71..4bd570ddd8 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -23,5 +23,4 @@ POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index b9fb103496..b4040e84a5 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "eeprom": { + "driver": "spi" + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index 1cfe4724b4..f8de9a3fb1 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -23,5 +23,4 @@ POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index 24fb8bc701..8d7cb4c823 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "eeprom": { + "driver": "spi" + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index 8c0e9b5891..b5612ce38a 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/blackpill/rules.mk @@ -21,5 +21,4 @@ SPLIT_KEYBOARD = yes MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index 1d25639281..c0f0d6a3b1 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "eeprom": { + "driver": "spi" + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index 8c0e9b5891..b5612ce38a 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk @@ -21,5 +21,4 @@ SPLIT_KEYBOARD = yes MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index dcdce8f63b..c410460857 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "eeprom": { + "driver": "spi" + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index 8c0e9b5891..b5612ce38a 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -21,5 +21,4 @@ SPLIT_KEYBOARD = yes MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/info.json index 590925065e..92d1fe99e8 100644 --- a/keyboards/custommk/ergostrafer/info.json +++ b/keyboards/custommk/ergostrafer/info.json @@ -4,6 +4,9 @@ "maintainer": "customMK", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "eeprom": { + "driver": "spi" + }, "features": { "bootmagic": true, "command": false, diff --git a/keyboards/custommk/ergostrafer/rules.mk b/keyboards/custommk/ergostrafer/rules.mk index ee519ea8b5..72f75f4367 100644 --- a/keyboards/custommk/ergostrafer/rules.mk +++ b/keyboards/custommk/ergostrafer/rules.mk @@ -1,3 +1 @@ -EEPROM_DRIVER = spi - AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/info.json index 18c618abc6..a11daef092 100644 --- a/keyboards/custommk/evo70_r2/info.json +++ b/keyboards/custommk/evo70_r2/info.json @@ -24,6 +24,9 @@ "device_version": "1.0.0" }, "diode_direction": "ROW2COL", + "eeprom": { + "driver": "spi" + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "rgblight": { diff --git a/keyboards/custommk/evo70_r2/rules.mk b/keyboards/custommk/evo70_r2/rules.mk index b79d08c6b7..193fe4f1a4 100644 --- a/keyboards/custommk/evo70_r2/rules.mk +++ b/keyboards/custommk/evo70_r2/rules.mk @@ -3,8 +3,6 @@ AUDIO_DRIVER = pwm_hardware # project specific files SRC += matrix.c -EEPROM_DRIVER = spi - QUANTUM_PAINTER_DRIVERS = st7735_spi CUSTOM_MATRIX = lite diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index 62fa261ac7..eafb77fce2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -5,6 +5,9 @@ "rows": ["B10", "B11", "B12", "A14", "A13", "A15"] }, "diode_direction": "COL2ROW", + "eeprom": { + "driver": "spi" + }, "rgblight": { "led_count": 20, "split_count": [10, 10] diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index 3959814c8d..ab601e31f9 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -1,6 +1,5 @@ # KEYBOARD_SHARED_EP = yes CONSOLE_ENABLE = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart AUDIO_DRIVER = dac_additive diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index 3f0c316928..e5a6dc6c7a 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -5,6 +5,9 @@ "rows": ["B12", "B13", "B14", "B15", "A8", "A10"] }, "diode_direction": "COL2ROW", + "eeprom": { + "driver": "spi" + }, "rgblight": { "led_count": 57, "split_count": [26, 31] diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index b466a6234a..0c4b05ee7e 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -2,6 +2,5 @@ KEYBOARD_SHARED_EP = yes CONSOLE_ENABLE = yes MOUSE_SHARED_EP = yes -EEPROM_DRIVER = spi SERIAL_DRIVER = usart AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json index f0904b8578..8f47f35027 100644 --- a/keyboards/tzarc/djinn/info.json +++ b/keyboards/tzarc/djinn/info.json @@ -9,6 +9,9 @@ "build": { "lto": true }, + "eeprom": { + "driver": "spi" + }, "features": { "audio": true, "backlight": true, diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk index e7c32e4dc1..5a4589a86f 100644 --- a/keyboards/tzarc/djinn/rules.mk +++ b/keyboards/tzarc/djinn/rules.mk @@ -4,8 +4,6 @@ SERIAL_DRIVER = usart CIE1931_CURVE = yes -EEPROM_DRIVER = spi - AUDIO_DRIVER = pwm_software QUANTUM_PAINTER_DRIVERS = ili9341_spi diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json index bf07f122c3..26824ca4da 100644 --- a/keyboards/tzarc/ghoul/info.json +++ b/keyboards/tzarc/ghoul/info.json @@ -5,6 +5,9 @@ "build": { "lto": true }, + "eeprom": { + "driver": "spi" + }, "features": { "bootmagic": true, "console": true, diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk index 9590c52217..5efa406e26 100644 --- a/keyboards/tzarc/ghoul/rules.mk +++ b/keyboards/tzarc/ghoul/rules.mk @@ -1,5 +1,4 @@ CUSTOM_MATRIX = lite -EEPROM_DRIVER = spi QUANTUM_PAINTER_DRIVERS = ssd1351_spi DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32