diff --git a/src/main/target/STM32F411/target.mk b/src/main/target/STM32F411/target.mk
index 8d917f0902..e2546745af 100644
--- a/src/main/target/STM32F411/target.mk
+++ b/src/main/target/STM32F411/target.mk
@@ -15,7 +15,7 @@ RX_SRC = \
drivers/rx/rx_a7105.c \
drivers/rx/rx_cyrf6936.c \
drivers/rx/rx_sx127x.c \
- drivers/rx/rx_sx1280.c \
+ drivers/rx/rx_sx1280.c
F411_TARGETS += $(TARGET)
diff --git a/src/main/target/STM32F411SX1280/target.c b/src/main/target/STM32F411SX1280/target.c
deleted file mode 100644
index a087e06bd2..0000000000
--- a/src/main/target/STM32F411SX1280/target.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of Cleanflight and Betaflight.
- *
- * Cleanflight and Betaflight are free software. You can redistribute
- * this software and/or modify this software under the terms of the
- * GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option)
- * any later version.
- *
- * Cleanflight and Betaflight are distributed in the hope that they
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software.
- *
- * If not, see .
- */
-
-// Needed to suppress the pedantic warning about an empty file
-#include
diff --git a/src/main/target/STM32F411SX1280/target.h b/src/main/target/STM32F411SX1280/target.h
deleted file mode 100644
index 9437289379..0000000000
--- a/src/main/target/STM32F411SX1280/target.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * This file is part of Cleanflight and Betaflight.
- *
- * Cleanflight and Betaflight are free software. You can redistribute
- * this software and/or modify this software under the terms of the
- * GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option)
- * any later version.
- *
- * Cleanflight and Betaflight are distributed in the hope that they
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software.
- *
- * If not, see .
- */
-
-#pragma once
-#define TARGET_BOARD_IDENTIFIER "S4SX"
-
-#define USBD_PRODUCT_STRING "Betaflight STM32F411SX1280"
-
-#define USE_UART1
-#define USE_UART2
-#define USE_UART6
-
-#define SERIAL_PORT_COUNT (UNIFIED_SERIAL_PORT_COUNT + 3)
-
-#define USE_INVERTER
-
-#define USE_SPI_DEVICE_1
-#define USE_SPI_DEVICE_2
-#define USE_SPI_DEVICE_3
-
-#define TARGET_IO_PORTA 0xffff
-#define TARGET_IO_PORTB 0xffff
-#define TARGET_IO_PORTC 0xffff
-#define TARGET_IO_PORTD 0xffff
-#define TARGET_IO_PORTE 0xffff
-
-#define DEFAULT_RX_FEATURE FEATURE_RX_SPI
-#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS
-
-#define USE_RX_EXPRESSLRS
-#define USE_RX_EXPRESSLRS_TELEMETRY
-#define USE_RX_SX1280
-#define RX_EXPRESSLRS_TIMER_INSTANCE TIM5
-#define RX_CHANNELS_AETR
-
-#define USE_BEEPER
-
-// MPU interrupt
-
-#if !defined(CLOUD_BUILD)
-
-#define USE_ACC
-#define USE_GYRO
-
-#define USE_ACC_MPU6500
-#define USE_GYRO_MPU6500
-#define USE_ACC_SPI_MPU6000
-#define USE_GYRO_SPI_MPU6000
-#define USE_ACC_SPI_MPU6500
-#define USE_GYRO_SPI_MPU6500
-#define USE_ACC_SPI_ICM20689
-#define USE_GYRO_SPI_ICM20689
-#define USE_ACCGYRO_LSM6DSO
-#define USE_ACCGYRO_BMI270
-#define USE_GYRO_SPI_ICM42605
-#define USE_GYRO_SPI_ICM42688P
-#define USE_ACC_SPI_ICM42605
-#define USE_ACC_SPI_ICM42688P
-
-#ifdef USE_MAG
-#define USE_MAG_DATA_READY_SIGNAL
-#define USE_MAG_HMC5883
-#define USE_MAG_SPI_HMC5883
-#define USE_MAG_QMC5883
-#define USE_MAG_LIS3MDL
-#define USE_MAG_AK8963
-#define USE_MAG_MPU925X_AK8963
-#define USE_MAG_SPI_AK8963
-#define USE_MAG_AK8975
-#endif
-
-#ifdef USE_BARO
-#define USE_BARO_MS5611
-#define USE_BARO_SPI_MS5611
-#define USE_BARO_BMP280
-#define USE_BARO_SPI_BMP280
-#define USE_BARO_BMP388
-#define USE_BARO_SPI_BMP388
-#define USE_BARO_LPS
-#define USE_BARO_SPI_LPS
-#define USE_BARO_QMP6988
-#define USE_BARO_SPI_QMP6988
-#define USE_BARO_DPS310
-#define USE_BARO_SPI_DPS310
-#endif
-
-#define USE_FLASHFS
-#define USE_FLASH_TOOLS
-#define USE_FLASH_M25P16
-#define USE_FLASH_W25N01G // 1Gb NAND flash support
-#define USE_FLASH_W25M // Stacked die support
-#define USE_FLASH_W25M512 // 512Kb (256Kb x 2 stacked) NOR flash support
-#define USE_FLASH_W25M02G // 2Gb (1Gb x 2 stacked) NAND flash support
-#define USE_FLASH_W25Q128FV // 16MB Winbond 25Q128
-
-#define USE_MAX7456
-
-#define USE_RX_SPI
-
-#define USE_SDCARD
-
-#endif // CLOUD_BUILD
-
-#ifdef USE_SDCARD
-#define USE_SDCARD_SPI
-#define USE_SDCARD_SDIO
-#endif
-
-#define USE_SPI
-#define SPI_FULL_RECONFIGURABILITY
-
-#define USE_VCP
-
-#define USE_SOFTSERIAL1
-#define USE_SOFTSERIAL2
-
-#define UNIFIED_SERIAL_PORT_COUNT 3
-
-#define USE_USB_DETECT
-
-#define USE_ESCSERIAL
-
-#define USE_ADC
-
-#define USE_CUSTOM_DEFAULTS
diff --git a/src/main/target/STM32F411SX1280/target.mk b/src/main/target/STM32F411SX1280/target.mk
deleted file mode 100644
index ec48b82856..0000000000
--- a/src/main/target/STM32F411SX1280/target.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-RX_SRC = \
- drivers/rx/expresslrs_driver.c \
- drivers/rx/rx_sx127x.c \
- drivers/rx/rx_sx1280.c \
- rx/expresslrs_telemetry.c \
- rx/expresslrs_common.c \
- rx/expresslrs.c
-
-F411_TARGETS += $(TARGET)
-
-FEATURES += VCP SDCARD_SPI SDCARD_SDIO ONBOARDFLASH
-
-TARGET_SRC = \
- $(addprefix drivers/accgyro/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro/*.c))) \
- $(ROOT)/lib/main/BoschSensortec/BMI270-Sensor-API/bmi270_maximum_fifo.c \
- $(addprefix drivers/barometer/,$(notdir $(wildcard $(SRC_DIR)/drivers/barometer/*.c))) \
- $(addprefix drivers/compass/,$(notdir $(wildcard $(SRC_DIR)/drivers/compass/*.c))) \
- drivers/max7456.c \
- drivers/vtx_rtc6705.c \
- drivers/vtx_rtc6705_soft_spi.c \
- $(RX_SRC)
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index 02d1342c51..a778425d57 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -266,7 +266,8 @@
// Number of pins that needs pre-init
#ifdef USE_SPI
#ifndef SPI_PREINIT_COUNT
-#define SPI_PREINIT_COUNT 16 // 2 x 8 (GYROx2, BARO, MAG, MAX, FLASHx2, RX)
+// 2 x 8 (GYROx2, BARO, MAG, MAX, FLASHx2, RX)
+#define SPI_PREINIT_COUNT 16
#endif
#endif
@@ -396,6 +397,11 @@ extern uint8_t __config_end;
#define USE_CUSTOM_DEFAULTS_ADDRESS
#endif
+#if defined(USE_RX_EXPRESSLRS) && defined(STM32F411)
+#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS
+#define RX_EXPRESSLRS_TIMER_INSTANCE TIM5
+#endif
+
#if defined(USE_RX_SPI) || defined (USE_SERIALRX_SRXL2)
#define USE_RX_BIND
#endif