diff --git a/src/main/drivers/at32/platform_at32.h b/src/main/drivers/at32/platform_at32.h
index 6688e5207fd..eb51ed31c30 100644
--- a/src/main/drivers/at32/platform_at32.h
+++ b/src/main/drivers/at32/platform_at32.h
@@ -69,3 +69,41 @@ typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState;
 #define DMA_RAM_RW
 
 #define USE_LATE_TASK_STATISTICS
+
+/*
+#ifndef SPI1_SCK_PIN
+#define SPI1_SCK_PIN    PA5
+#define SPI1_MISO_PIN   PA6
+#define SPI1_MOSI_PIN   PA7
+#endif
+
+#ifndef SPI2_SCK_PIN
+#define SPI2_SCK_PIN    PB13
+#define SPI2_MISO_PIN   PB14
+#define SPI2_MOSI_PIN   PB15
+#endif
+
+#ifndef SPI3_SCK_PIN
+#define SPI3_SCK_PIN    PB3
+#define SPI3_MISO_PIN   PB4
+#define SPI3_MOSI_PIN   PB5
+#endif
+
+#ifndef SPI4_SCK_PIN
+#define SPI4_SCK_PIN    NONE
+#define SPI4_MISO_PIN   NONE
+#define SPI4_MOSI_PIN   NONE
+#endif
+
+#ifndef SPI5_SCK_PIN
+#define SPI5_SCK_PIN    NONE
+#define SPI5_MISO_PIN   NONE
+#define SPI5_MOSI_PIN   NONE
+#endif
+
+#ifndef SPI6_SCK_PIN
+#define SPI6_SCK_PIN    NONE
+#define SPI6_MISO_PIN   NONE
+#define SPI6_MOSI_PIN   NONE
+#endif
+*/
diff --git a/src/main/drivers/stm32/platform_stm32.h b/src/main/drivers/stm32/platform_stm32.h
index 4ec75a703cb..3e4e70ade62 100644
--- a/src/main/drivers/stm32/platform_stm32.h
+++ b/src/main/drivers/stm32/platform_stm32.h
@@ -303,3 +303,38 @@ extern uint8_t _dmaram_end__;
 #endif
 #endif // STM32F7
 
+#ifndef SPI1_SCK_PIN
+#define SPI1_SCK_PIN    PA5
+#define SPI1_MISO_PIN   PA6
+#define SPI1_MOSI_PIN   PA7
+#endif
+
+#ifndef SPI2_SCK_PIN
+#define SPI2_SCK_PIN    PB13
+#define SPI2_MISO_PIN   PB14
+#define SPI2_MOSI_PIN   PB15
+#endif
+
+#ifndef SPI3_SCK_PIN
+#define SPI3_SCK_PIN    PB3
+#define SPI3_MISO_PIN   PB4
+#define SPI3_MOSI_PIN   PB5
+#endif
+
+#ifndef SPI4_SCK_PIN
+#define SPI4_SCK_PIN    NONE
+#define SPI4_MISO_PIN   NONE
+#define SPI4_MOSI_PIN   NONE
+#endif
+
+#ifndef SPI5_SCK_PIN
+#define SPI5_SCK_PIN    NONE
+#define SPI5_MISO_PIN   NONE
+#define SPI5_MOSI_PIN   NONE
+#endif
+
+#ifndef SPI6_SCK_PIN
+#define SPI6_SCK_PIN    NONE
+#define SPI6_MISO_PIN   NONE
+#define SPI6_MOSI_PIN   NONE
+#endif
diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h
index 4063142f8ad..5be565bd6c4 100644
--- a/src/main/target/common_defaults_post.h
+++ b/src/main/target/common_defaults_post.h
@@ -89,87 +89,6 @@
 #define I2C4_PULLUP false
 #endif
 
-// pg/bus_spi
-
-#ifdef SPI_FULL_RECONFIGURABILITY
-
-#ifdef USE_SPI_DEVICE_1
-#define SPI1_SCK_PIN    NONE
-#define SPI1_MISO_PIN   NONE
-#define SPI1_MOSI_PIN   NONE
-#endif
-
-#ifdef USE_SPI_DEVICE_2
-#define SPI2_SCK_PIN    NONE
-#define SPI2_MISO_PIN   NONE
-#define SPI2_MOSI_PIN   NONE
-#endif
-
-#ifdef USE_SPI_DEVICE_3
-#define SPI3_SCK_PIN    NONE
-#define SPI3_MISO_PIN   NONE
-#define SPI3_MOSI_PIN   NONE
-#endif
-
-#ifdef USE_SPI_DEVICE_4
-#define SPI4_SCK_PIN    NONE
-#define SPI4_MISO_PIN   NONE
-#define SPI4_MOSI_PIN   NONE
-#endif
-
-#ifdef USE_SPI_DEVICE_5
-#define SPI5_SCK_PIN    NONE
-#define SPI5_MISO_PIN   NONE
-#define SPI5_MOSI_PIN   NONE
-#endif
-
-#ifdef USE_SPI_DEVICE_6
-#define SPI6_SCK_PIN    NONE
-#define SPI6_MISO_PIN   NONE
-#define SPI6_MOSI_PIN   NONE
-#endif
-#else
-
-// Pin defaults for backward compatibility
-
-#ifndef SPI1_SCK_PIN
-#define SPI1_SCK_PIN    PA5
-#define SPI1_MISO_PIN   PA6
-#define SPI1_MOSI_PIN   PA7
-#endif
-
-#ifndef SPI2_SCK_PIN
-#define SPI2_SCK_PIN    PB13
-#define SPI2_MISO_PIN   PB14
-#define SPI2_MOSI_PIN   PB15
-#endif
-
-#ifndef SPI3_SCK_PIN
-#define SPI3_SCK_PIN    PB3
-#define SPI3_MISO_PIN   PB4
-#define SPI3_MOSI_PIN   PB5
-#endif
-
-#ifndef SPI4_SCK_PIN
-#define SPI4_SCK_PIN    NONE
-#define SPI4_MISO_PIN   NONE
-#define SPI4_MOSI_PIN   NONE
-#endif
-
-#ifndef SPI5_SCK_PIN
-#define SPI5_SCK_PIN    NONE
-#define SPI5_MISO_PIN   NONE
-#define SPI5_MOSI_PIN   NONE
-#endif
-
-#ifndef SPI6_SCK_PIN
-#define SPI6_SCK_PIN    NONE
-#define SPI6_MISO_PIN   NONE
-#define SPI6_MOSI_PIN   NONE
-#endif
-
-#endif
-
 // Extracted from rx/rx.c and rx/rx.h
 
 #define RX_MAPPABLE_CHANNEL_COUNT 8