diff --git a/src/main/target/IFLIGHT_BLITZ_F405/target.h b/src/main/target/IFLIGHT_BLITZ_F405/target.h
index 45e86da05b..bb0d69a611 100644
--- a/src/main/target/IFLIGHT_BLITZ_F405/target.h
+++ b/src/main/target/IFLIGHT_BLITZ_F405/target.h
@@ -21,9 +21,11 @@
//#define USE_TARGET_CONFIG
-#define TARGET_BOARD_IDENTIFIER "IBF4"
-#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
-#define USBD_PRODUCT_STRING "IFLIGHT_BLITZ_F405"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_BLITZ_F405"
+
+#define FC_TARGET_MCU STM32F405 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S405" // generic ID
#define LED0_PIN PC15
diff --git a/src/main/target/IFLIGHT_F405_TWING/IFLIGHT_F405_TWING_M.mk b/src/main/target/IFLIGHT_F405_TWING/IFLIGHT_F405_TWING_M.mk.bak
similarity index 100%
rename from src/main/target/IFLIGHT_F405_TWING/IFLIGHT_F405_TWING_M.mk
rename to src/main/target/IFLIGHT_F405_TWING/IFLIGHT_F405_TWING_M.mk.bak
diff --git a/src/main/target/IFLIGHT_F411_AIO32/target.h b/src/main/target/IFLIGHT_F411_AIO32/target.h
index 4467642b74..057462579d 100644
--- a/src/main/target/IFLIGHT_F411_AIO32/target.h
+++ b/src/main/target/IFLIGHT_F411_AIO32/target.h
@@ -20,9 +20,12 @@
#pragma once
-#define TARGET_BOARD_IDENTIFIER "S411"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
#define USBD_PRODUCT_STRING "IFLIGHT_F411_AIO32"
+#define FC_TARGET_MCU STM32F411 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S411" // generic ID
+
#define LED0_PIN PB5
#define USE_BEEPER
diff --git a/src/main/target/IFLIGHT_F411_PRO/target.h b/src/main/target/IFLIGHT_F411_PRO/target.h
index 599f5cf2f9..2539723608 100644
--- a/src/main/target/IFLIGHT_F411_PRO/target.h
+++ b/src/main/target/IFLIGHT_F411_PRO/target.h
@@ -19,8 +19,12 @@
*/
#pragma once
-#define TARGET_BOARD_IDENTIFIER "S411"
-#define USBD_PRODUCT_STRING "IFLIGHT_F411_PRO"
+
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_F411_PRO"
+
+#define FC_TARGET_MCU STM32F411 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S411" // generic ID
#define ENABLE_DSHOT_DMAR true
diff --git a/src/main/target/IFLIGHT_F722_TWING/target.h b/src/main/target/IFLIGHT_F722_TWING/target.h
index dcaf56de6f..535a4b68b0 100644
--- a/src/main/target/IFLIGHT_F722_TWING/target.h
+++ b/src/main/target/IFLIGHT_F722_TWING/target.h
@@ -20,9 +20,11 @@
#pragma once
-#define TARGET_BOARD_IDENTIFIER "S7X2"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_F722_TWING"
-#define USBD_PRODUCT_STRING "IFLIGHT F7 TWIN G"
+#define FC_TARGET_MCU STM32F7X2 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S7X2" // generic ID
#define USE_DUAL_GYRO
diff --git a/src/main/target/IFLIGHT_F745_AIO/target.h b/src/main/target/IFLIGHT_F745_AIO/target.h
index 0cf4b6b8b7..c32ed746ed 100644
--- a/src/main/target/IFLIGHT_F745_AIO/target.h
+++ b/src/main/target/IFLIGHT_F745_AIO/target.h
@@ -20,10 +20,12 @@
#pragma once
-#define TARGET_BOARD_IDENTIFIER "IFRC"
-
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
#define USBD_PRODUCT_STRING "IFLIGHT_F745_AIO"
+#define FC_TARGET_MCU STM32F745 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S745" // generic ID
+
#define LED0_PIN PC13
#define USE_BEEPER
diff --git a/src/main/target/IFLIGHT_F745_AIO_V2/target.h b/src/main/target/IFLIGHT_F745_AIO_V2/target.h
index e771a75672..e9a9e73836 100644
--- a/src/main/target/IFLIGHT_F745_AIO_V2/target.h
+++ b/src/main/target/IFLIGHT_F745_AIO_V2/target.h
@@ -20,10 +20,12 @@
#pragma once
-#define TARGET_BOARD_IDENTIFIER "IFRC"
-
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
#define USBD_PRODUCT_STRING "IFLIGHT_F745_AIO_V2"
+#define FC_TARGET_MCU STM32F745 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S745" // generic ID
+
#define ENABLE_DSHOT_DMAR true
#define LED0_PIN PC13
diff --git a/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.c b/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.c
deleted file mode 100644
index 685757a7bb..0000000000
--- a/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.c
+++ /dev/null
@@ -1,41 +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 .
- */
-
-#include
-
-#include "platform.h"
-#include "drivers/io.h"
-
-#include "drivers/dma.h"
-#include "drivers/timer.h"
-#include "drivers/timer_def.h"
-
-const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-
- DEF_TIM(TIM2, CH4, PA3, TIM_USE_PPM, 0, 0),
-
- DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0),
- DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0),
- DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0),
- DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 0),
-
- DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0)
-
-};
diff --git a/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.h b/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.h
deleted file mode 100644
index fb0ea6a4eb..0000000000
--- a/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.h
+++ /dev/null
@@ -1,135 +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 "IFRC"
-#define USBD_PRODUCT_STRING "IFLIGHT SUCCEX E F4"
-
-#define LED0_PIN PB5
-
-#define USE_BEEPER
-#define BEEPER_PIN PB4
-#define BEEPER_INVERTED
-
-#define ENABLE_DSHOT_DMAR true
-
-#define INVERTER_PIN_UART2 PC13
-
-#define USE_EXTI
-#define MPU_INT_EXTI PC4
-#define USE_MPU_DATA_READY_SIGNAL
-
-// MPU 6000
-
-#define MPU6000_CS_PIN PA4
-#define MPU6000_SPI_INSTANCE SPI1
-#define USE_ACC
-#define USE_ACC_SPI_MPU6000
-#define USE_GYRO
-#define USE_GYRO_SPI_MPU6000
-#define GYRO_MPU6000_ALIGN CW180_DEG
-#define ACC_MPU6000_ALIGN CW180_DEG
-
-#define USE_MAX7456
-#define MAX7456_SPI_INSTANCE SPI2
-#define MAX7456_SPI_CS_PIN PB12
-#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD)
-#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST)
-
-#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
-#define USE_FLASHFS
-#define USE_FLASH_M25P16
-#define FLASH_CS_PIN PA15
-#define FLASH_SPI_INSTANCE SPI3
-
-#define USE_VCP
-#define USE_USB_DETECT
-#define USB_DETECT_PIN PC5
-
-#define USE_UART1
-#define UART1_RX_PIN PA10
-#define UART1_TX_PIN PA9
-
-#define USE_UART2
-#define UART2_RX_PIN PA3
-#define UART2_TX_PIN PA2
-
-#define USE_UART3
-#define UART3_RX_PIN PB11
-#define UART3_TX_PIN PB10
-
-#define USE_UART4
-#define UART4_RX_PIN PA1
-#define UART4_TX_PIN PA0
-
-#define USE_UART6
-#define UART6_RX_PIN PC7
-#define UART6_TX_PIN PC6
-
-#define SERIAL_PORT_COUNT 6
-
-#define USE_SPI
-#define USE_SPI_DEVICE_1
-//#define SPI1_NSS_PIN PA4
-#define SPI1_SCK_PIN PA5
-#define SPI1_MISO_PIN PA6
-#define SPI1_MOSI_PIN PA7
-
-#define USE_SPI_DEVICE_2
-//#define SPI2_NSS_PIN PB12
-#define SPI2_SCK_PIN PB13
-#define SPI2_MISO_PIN PB14
-#define SPI2_MOSI_PIN PB15
-
-#define USE_SPI_DEVICE_3
-//#define SPI3_NSS_PIN PA15
-#define SPI3_SCK_PIN PC10
-#define SPI3_MISO_PIN PC11
-#define SPI3_MOSI_PIN PC12
-
-#define USE_BARO
-#define USE_BARO_BMP280
-
-#define USE_I2C
-#define USE_I2C_DEVICE_2
-#define I2C2_SCL PB10
-#define I2C2_SDA PB11
-#define I2C_DEVICE (I2CDEV_2)
-
-#define USE_ADC
-#define CURRENT_METER_ADC_PIN PC1
-#define VBAT_ADC_PIN PC2
-#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
-#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define CURRENT_METER_OFFSET_DEFAULT -700
-#define CURRENT_METER_SCALE_DEFAULT 100
-//#define VBAT_SCALE
-
-#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
-#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_AIRMODE | FEATURE_LED_STRIP)
-
-#define TARGET_IO_PORTA 0xffff
-#define TARGET_IO_PORTB 0xffff
-#define TARGET_IO_PORTC 0xffff
-#define TARGET_IO_PORTD (BIT(2))
-
-#define USABLE_TIMER_CHANNEL_COUNT 6
-#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) )
diff --git a/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.mk b/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.mk
deleted file mode 100644
index c54bf27f9a..0000000000
--- a/src/main/target/IFLIGHT_SUCCEX_E_F4/IFF4_E/target.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-F405_TARGETS += $(TARGET)
-FEATURES = VCP ONBOARDFLASH
-TARGET_SRC = \
- drivers/accgyro/accgyro_mpu.c \
- drivers/accgyro/accgyro_spi_mpu6000.c \
- drivers/barometer/barometer_bmp280.c \
- drivers/max7456.c
diff --git a/src/main/target/IFLIGHT_SUCCEX_E_F4/target.h b/src/main/target/IFLIGHT_SUCCEX_E_F4/target.h
index 90b11b7bcb..a52e5907db 100644
--- a/src/main/target/IFLIGHT_SUCCEX_E_F4/target.h
+++ b/src/main/target/IFLIGHT_SUCCEX_E_F4/target.h
@@ -20,8 +20,11 @@
#pragma once
-#define TARGET_BOARD_IDENTIFIER "IFRC"
-#define USBD_PRODUCT_STRING "IFLIGHT_SUCCEX_E_F4"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_SUCCEX_E_F4"
+
+#define FC_TARGET_MCU STM32F405 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S405" // generic ID
#define LED0_PIN PB5
diff --git a/src/main/target/IFLIGHT_SUCCEX_E_F7/target.h b/src/main/target/IFLIGHT_SUCCEX_E_F7/target.h
index 372fc9d935..e456cbc6b8 100644
--- a/src/main/target/IFLIGHT_SUCCEX_E_F7/target.h
+++ b/src/main/target/IFLIGHT_SUCCEX_E_F7/target.h
@@ -20,9 +20,11 @@
#pragma once
-#define TARGET_BOARD_IDENTIFIER "S7X2"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_SUCCEX_E_F7"
-#define USBD_PRODUCT_STRING "IFLIGHT_SUCCEX_E_F7"
+#define FC_TARGET_MCU STM32F7X2 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S7X2" // generic ID
#define ENABLE_DSHOT_DMAR true