Remove duplicate of SPI default config from keyboards (#25266)

64 files changed, 8 insertions, 169 deletions

diff --git a/keyboards/adafruit/macropad/halconf.h b/keyboards/adafruit/macropad/halconf.h
index 2e3be29bbf..53c366ea1c 100644
--- a/keyboards/adafruit/macropad/halconf.h
+++ b/keyboards/adafruit/macropad/halconf.h
@@ -16,16 +16,7 @@
 
 #pragma once
 
-#include_next <halconf.h>
-
-#undef HAL_USE_SPI
 #define HAL_USE_SPI TRUE
-
-#undef SPI_USE_WAIT
-#define SPI_USE_WAIT TRUE
-
-#undef SPI_SELECT_MODE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
-#undef HAL_USE_PWM
 #define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/akko/5087/halconf.h b/keyboards/akko/5087/halconf.h
index 55bfe5c977..b8ebdb3369 100644
--- a/keyboards/akko/5087/halconf.h
+++ b/keyboards/akko/5087/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/akko/5108/halconf.h b/keyboards/akko/5108/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/akko/5108/halconf.h
+++ b/keyboards/akko/5108/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/akko/acr87/halconf.h b/keyboards/akko/acr87/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/akko/acr87/halconf.h
+++ b/keyboards/akko/acr87/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/akko/top40/halconf.h b/keyboards/akko/top40/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/akko/top40/halconf.h
+++ b/keyboards/akko/top40/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/annepro2/halconf.h b/keyboards/annepro2/halconf.h
index dcb04eab1b..980435448f 100644
--- a/keyboards/annepro2/halconf.h
+++ b/keyboards/annepro2/halconf.h
@@ -26,7 +26,5 @@
 #define SERIAL_USB_BUFFERS_SIZE 256
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
index c43f84e0de..300b0eeaed 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
index 1ba700a80f..5c5dff98d4 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
index c43f84e0de..300b0eeaed 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/scylla/blackpill/halconf.h b/keyboards/bastardkb/scylla/blackpill/halconf.h
index 1ba700a80f..5c5dff98d4 100644
--- a/keyboards/bastardkb/scylla/blackpill/halconf.h
+++ b/keyboards/bastardkb/scylla/blackpill/halconf.h
@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/skeletyl/blackpill/halconf.h b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
index 1ba700a80f..5c5dff98d4 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/halconf.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/tbkmini/blackpill/halconf.h b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
index 1ba700a80f..5c5dff98d4 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/halconf.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/chosfox/cf81/halconf.h b/keyboards/chosfox/cf81/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/chosfox/cf81/halconf.h
+++ b/keyboards/chosfox/cf81/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/custommk/cmk11/halconf.h b/keyboards/custommk/cmk11/halconf.h
index 6791d829f9..32d126efc5 100644
--- a/keyboards/custommk/cmk11/halconf.h
+++ b/keyboards/custommk/cmk11/halconf.h
@@ -20,11 +20,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>
diff --git a/keyboards/custommk/elysian/halconf.h b/keyboards/custommk/elysian/halconf.h
index 5b2f7eedd2..501c3e00b5 100644
--- a/keyboards/custommk/elysian/halconf.h
+++ b/keyboards/custommk/elysian/halconf.h
@@ -5,10 +5,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>
diff --git a/keyboards/custommk/ergostrafer/halconf.h b/keyboards/custommk/ergostrafer/halconf.h
index aed037ba2a..17a94765ca 100644
--- a/keyboards/custommk/ergostrafer/halconf.h
+++ b/keyboards/custommk/ergostrafer/halconf.h
@@ -20,11 +20,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>
diff --git a/keyboards/custommk/ergostrafer_rgb/halconf.h b/keyboards/custommk/ergostrafer_rgb/halconf.h
index 6791d829f9..32d126efc5 100644
--- a/keyboards/custommk/ergostrafer_rgb/halconf.h
+++ b/keyboards/custommk/ergostrafer_rgb/halconf.h
@@ -20,11 +20,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>
diff --git a/keyboards/custommk/evo70_r2/halconf.h b/keyboards/custommk/evo70_r2/halconf.h
index 5268fe5de6..da1c76d1de 100644
--- a/keyboards/custommk/evo70_r2/halconf.h
+++ b/keyboards/custommk/evo70_r2/halconf.h
@@ -26,11 +26,6 @@
 
 #define HAL_USE_GPT TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>
diff --git a/keyboards/darkproject/kd83a_bfg_edition/halconf.h b/keyboards/darkproject/kd83a_bfg_edition/halconf.h
index 8f61d3fc64..adeb248f90 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/halconf.h
+++ b/keyboards/darkproject/kd83a_bfg_edition/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/darkproject/kd87a_bfg_edition/halconf.h b/keyboards/darkproject/kd87a_bfg_edition/halconf.h
index 8f61d3fc64..adeb248f90 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/halconf.h
+++ b/keyboards/darkproject/kd87a_bfg_edition/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/darmoshark/k3/halconf.h b/keyboards/darmoshark/k3/halconf.h
index b6a606056a..adf026a47a 100644
--- a/keyboards/darmoshark/k3/halconf.h
+++ b/keyboards/darmoshark/k3/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/edi/hardlight/mk2/halconf.h b/keyboards/edi/hardlight/mk2/halconf.h
index 498f31a919..f7b5100b2c 100644
--- a/keyboards/edi/hardlight/mk2/halconf.h
+++ b/keyboards/edi/hardlight/mk2/halconf.h
@@ -25,8 +25,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Activate Serial Peripheral Interface
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
-
-#include_next <halconf.h>
\ No newline at end of file
+#include_next <halconf.h>
diff --git a/keyboards/gmmk/gmmk2/p65/halconf.h b/keyboards/gmmk/gmmk2/p65/halconf.h
index 293d182917..24941b1b6c 100644
--- a/keyboards/gmmk/gmmk2/p65/halconf.h
+++ b/keyboards/gmmk/gmmk2/p65/halconf.h
@@ -22,8 +22,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
-
diff --git a/keyboards/gmmk/gmmk2/p96/halconf.h b/keyboards/gmmk/gmmk2/p96/halconf.h
index 293d182917..24941b1b6c 100644
--- a/keyboards/gmmk/gmmk2/p96/halconf.h
+++ b/keyboards/gmmk/gmmk2/p96/halconf.h
@@ -22,8 +22,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
-
diff --git a/keyboards/gmmk/numpad/halconf.h b/keyboards/gmmk/numpad/halconf.h
index b6b68a4e63..7ac9455f98 100644
--- a/keyboards/gmmk/numpad/halconf.h
+++ b/keyboards/gmmk/numpad/halconf.h
@@ -18,9 +18,6 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 #define HAL_USE_ADC TRUE
 
-
-#include_next <halconf.h>
\ No newline at end of file
+#include_next <halconf.h>
diff --git a/keyboards/gmmk/pro/rev1/halconf.h b/keyboards/gmmk/pro/rev1/halconf.h
index 8d9b60c234..cfd866f371 100644
--- a/keyboards/gmmk/pro/rev1/halconf.h
+++ b/keyboards/gmmk/pro/rev1/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/gmmk/pro/rev2/halconf.h b/keyboards/gmmk/pro/rev2/halconf.h
index 8d9b60c234..cfd866f371 100644
--- a/keyboards/gmmk/pro/rev2/halconf.h
+++ b/keyboards/gmmk/pro/rev2/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/at_start_f415/halconf.h b/keyboards/handwired/onekey/at_start_f415/halconf.h
index 1fc1b548a2..3c3ba3812a 100644
--- a/keyboards/handwired/onekey/at_start_f415/halconf.h
+++ b/keyboards/handwired/onekey/at_start_f415/halconf.h
@@ -11,6 +11,5 @@
 #define HAL_USE_PWM TRUE
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/kb2040/halconf.h b/keyboards/handwired/onekey/kb2040/halconf.h
index ce781aa374..96d14ae85c 100644
--- a/keyboards/handwired/onekey/kb2040/halconf.h
+++ b/keyboards/handwired/onekey/kb2040/halconf.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/rp2040/halconf.h b/keyboards/handwired/onekey/rp2040/halconf.h
index da4a49b5c1..6310808d9a 100644
--- a/keyboards/handwired/onekey/rp2040/halconf.h
+++ b/keyboards/handwired/onekey/rp2040/halconf.h
@@ -10,6 +10,5 @@
 #define HAL_USE_ADC TRUE
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/halconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/halconf.h
index 62f56e4d2b..b06f52b7df 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/halconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/halconf.h
@@ -21,7 +21,5 @@
 #define HAL_USE_SPI     TRUE
 #define HAL_USE_GPT     TRUE
 #define HAL_USE_DAC     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f405/halconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f405/halconf.h
index 23f8e5c934..3cf07b9be0 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f405/halconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f405/halconf.h
@@ -22,11 +22,6 @@
 #    define HAL_USE_PWM TRUE
 #endif // defined(WS2812_PWM) || defined(BACKLIGHT_PWM)
 
-#if HAL_USE_SPI == TRUE
-#    define SPI_USE_WAIT TRUE
-#    define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#endif
-
 #ifdef AUDIO_DRIVER_DAC
 #    define HAL_USE_GPT TRUE
 #    define HAL_USE_DAC TRUE
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h
index bc07c10527..296119b080 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h
@@ -19,7 +19,5 @@
 #define HAL_USE_SERIAL  TRUE
 #define HAL_USE_I2C     TRUE
 #define HAL_USE_SPI     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/hazel/bad_wings/halconf.h b/keyboards/hazel/bad_wings/halconf.h
index ed9500fe75..dbb40c4c27 100644
--- a/keyboards/hazel/bad_wings/halconf.h
+++ b/keyboards/hazel/bad_wings/halconf.h
@@ -6,7 +6,5 @@
 #define HAL_USE_SPI     TRUE
 #define HAL_USE_I2C     TRUE
 #define HAL_USE_PWM     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
-#include_next <halconf.h>
\ No newline at end of file
+#include_next <halconf.h>
diff --git a/keyboards/hazel/bad_wings_v2/halconf.h b/keyboards/hazel/bad_wings_v2/halconf.h
index 6d6a6511bf..fa7e45bdcd 100644
--- a/keyboards/hazel/bad_wings_v2/halconf.h
+++ b/keyboards/hazel/bad_wings_v2/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/hfdkb/ac001/halconf.h b/keyboards/hfdkb/ac001/halconf.h
index 7ad0a62d2e..b06fd7e719 100644
--- a/keyboards/hfdkb/ac001/halconf.h
+++ b/keyboards/hfdkb/ac001/halconf.h
@@ -16,7 +16,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/horrortroll/handwired_k552/halconf.h b/keyboards/horrortroll/handwired_k552/halconf.h
index a8be303915..bc38dd1baf 100644
--- a/keyboards/horrortroll/handwired_k552/halconf.h
+++ b/keyboards/horrortroll/handwired_k552/halconf.h
@@ -22,9 +22,6 @@
 #pragma once
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/inland/kb83/halconf.h b/keyboards/inland/kb83/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/inland/kb83/halconf.h
+++ b/keyboards/inland/kb83/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/inland/mk47/halconf.h b/keyboards/inland/mk47/halconf.h
index 55bfe5c977..b8ebdb3369 100644
--- a/keyboards/inland/mk47/halconf.h
+++ b/keyboards/inland/mk47/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/inland/v83p/halconf.h b/keyboards/inland/v83p/halconf.h
index fcd8b7216a..f3178d93f0 100644
--- a/keyboards/inland/v83p/halconf.h
+++ b/keyboards/inland/v83p/halconf.h
@@ -5,7 +5,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/jidohun/km113/halconf.h b/keyboards/jidohun/km113/halconf.h
index 6ff2f1ec67..7e9c966f40 100644
--- a/keyboards/jidohun/km113/halconf.h
+++ b/keyboards/jidohun/km113/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/jukaie/jk01/halconf.h b/keyboards/jukaie/jk01/halconf.h
index 64a184eb92..e17fed3886 100644
--- a/keyboards/jukaie/jk01/halconf.h
+++ b/keyboards/jukaie/jk01/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/kbdfans/odin75/halconf.h b/keyboards/kbdfans/odin75/halconf.h
index 0218214174..15cb9895ba 100644
--- a/keyboards/kbdfans/odin75/halconf.h
+++ b/keyboards/kbdfans/odin75/halconf.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-#include_next <halconf.h>
-
-#undef HAL_USE_SPI
 #define HAL_USE_SPI TRUE
 
-#undef SPI_USE_WAIT
-#define SPI_USE_WAIT TRUE
-
-#undef SPI_SELECT_MODE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#include_next <halconf.h>
diff --git a/keyboards/mechwild/puckbuddy/halconf.h b/keyboards/mechwild/puckbuddy/halconf.h
index 07e8cdd17b..fb6312d554 100644
--- a/keyboards/mechwild/puckbuddy/halconf.h
+++ b/keyboards/mechwild/puckbuddy/halconf.h
@@ -5,9 +5,6 @@
 #pragma once
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/mechwild/sugarglider/halconf.h b/keyboards/mechwild/sugarglider/halconf.h
index 23a1dc04b3..76bd6cf256 100644
--- a/keyboards/mechwild/sugarglider/halconf.h
+++ b/keyboards/mechwild/sugarglider/halconf.h
@@ -4,9 +4,6 @@
 #pragma once
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/moky/moky67/halconf.h b/keyboards/moky/moky67/halconf.h
index 0a59a1fcb8..5d94695838 100644
--- a/keyboards/moky/moky67/halconf.h
+++ b/keyboards/moky/moky67/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/moky/moky88/halconf.h b/keyboards/moky/moky88/halconf.h
index 0a59a1fcb8..5d94695838 100644
--- a/keyboards/moky/moky88/halconf.h
+++ b/keyboards/moky/moky88/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/monsgeek/m1/halconf.h b/keyboards/monsgeek/m1/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/monsgeek/m1/halconf.h
+++ b/keyboards/monsgeek/m1/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/monsgeek/m3/halconf.h b/keyboards/monsgeek/m3/halconf.h
index 55bfe5c977..b8ebdb3369 100644
--- a/keyboards/monsgeek/m3/halconf.h
+++ b/keyboards/monsgeek/m3/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/monsgeek/m5/halconf.h b/keyboards/monsgeek/m5/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/monsgeek/m5/halconf.h
+++ b/keyboards/monsgeek/m5/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/monsgeek/m6/halconf.h b/keyboards/monsgeek/m6/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/monsgeek/m6/halconf.h
+++ b/keyboards/monsgeek/m6/halconf.h
@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/phentech/rpk_001/halconf.h b/keyboards/phentech/rpk_001/halconf.h
index 8760386e81..872e0217df 100644
--- a/keyboards/phentech/rpk_001/halconf.h
+++ b/keyboards/phentech/rpk_001/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/projectd/65/projectd_65_ansi/halconf.h b/keyboards/projectd/65/projectd_65_ansi/halconf.h
index 64a184eb92..e17fed3886 100644
--- a/keyboards/projectd/65/projectd_65_ansi/halconf.h
+++ b/keyboards/projectd/65/projectd_65_ansi/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/projectd/75/ansi/halconf.h b/keyboards/projectd/75/ansi/halconf.h
index 64a184eb92..e17fed3886 100644
--- a/keyboards/projectd/75/ansi/halconf.h
+++ b/keyboards/projectd/75/ansi/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/projectd/75/iso/halconf.h b/keyboards/projectd/75/iso/halconf.h
index 64a184eb92..e17fed3886 100644
--- a/keyboards/projectd/75/iso/halconf.h
+++ b/keyboards/projectd/75/iso/halconf.h
@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/sawnsprojects/okayu/halconf.h b/keyboards/sawnsprojects/okayu/halconf.h
index eb4e81c9ac..08878e9558 100644
--- a/keyboards/sawnsprojects/okayu/halconf.h
+++ b/keyboards/sawnsprojects/okayu/halconf.h
@@ -4,6 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
 #include_next <halconf.h>
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/halconf.h b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h
index 9d456a5106..50251bd9cb 100644
--- a/keyboards/sharkoon/skiller_sgk50_s2/halconf.h
+++ b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/halconf.h b/keyboards/sharkoon/skiller_sgk50_s3/halconf.h
index 8760386e81..872e0217df 100644
--- a/keyboards/sharkoon/skiller_sgk50_s3/halconf.h
+++ b/keyboards/sharkoon/skiller_sgk50_s3/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/halconf.h b/keyboards/sharkoon/skiller_sgk50_s4/halconf.h
index 9d456a5106..50251bd9cb 100644
--- a/keyboards/sharkoon/skiller_sgk50_s4/halconf.h
+++ b/keyboards/sharkoon/skiller_sgk50_s4/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/splitkb/elora/rev1/halconf.h b/keyboards/splitkb/elora/rev1/halconf.h
index 9798aa34f9..4a2cc2c514 100644
--- a/keyboards/splitkb/elora/rev1/halconf.h
+++ b/keyboards/splitkb/elora/rev1/halconf.h
@@ -6,8 +6,6 @@
 #define HAL_USE_SIO TRUE
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 #define HAL_USE_ADC TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/splitkb/halcyon/elora/rev2/halconf.h b/keyboards/splitkb/halcyon/elora/rev2/halconf.h
index fd95e15f83..a6937ddf9d 100644
--- a/keyboards/splitkb/halcyon/elora/rev2/halconf.h
+++ b/keyboards/splitkb/halcyon/elora/rev2/halconf.h
@@ -6,9 +6,6 @@
 //// VIK
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/splitkb/halcyon/kyria/rev4/halconf.h b/keyboards/splitkb/halcyon/kyria/rev4/halconf.h
index 1050ebf313..6d2db1bbd2 100644
--- a/keyboards/splitkb/halcyon/kyria/rev4/halconf.h
+++ b/keyboards/splitkb/halcyon/kyria/rev4/halconf.h
@@ -6,9 +6,6 @@
 //// VIK
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/tacworks/tac_k1/halconf.h b/keyboards/tacworks/tac_k1/halconf.h
index 8760386e81..872e0217df 100644
--- a/keyboards/tacworks/tac_k1/halconf.h
+++ b/keyboards/tacworks/tac_k1/halconf.h
@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/trnthsn/s6xty5neor2/halconf.h b/keyboards/trnthsn/s6xty5neor2/halconf.h
index 337ed5da18..b8f0a217c4 100644
--- a/keyboards/trnthsn/s6xty5neor2/halconf.h
+++ b/keyboards/trnthsn/s6xty5neor2/halconf.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
 #include_next <halconf.h>