diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt
index 83ab61bcf..f2416a9c5 100644
--- a/components/esp_wifi/CMakeLists.txt
+++ b/components/esp_wifi/CMakeLists.txt
@@ -83,18 +83,7 @@ if(CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION)
         idf_component_get_property(sub_args esptool_py FLASH_SUB_ARGS)
     endif()
 
-    # ToDo: remove once MP chip is supported
-    if(CONFIG_IDF_TARGET_ESP32)
-        set(phy_name "phy")
-    elseif(CONFIG_IDF_TARGET_ESP32S2)
-        if(CONFIG_ESP32S2_VERSION_A)
-            set(phy_name "phyA")
-        elseif(CONFIG_ESP32S2_VERSION_B)
-            set(phy_name "phyB")
-        elseif(CONFIG_ESP32S2_VERSION_MARLIN3)
-            set(phy_name "phy_marlin3")
-        endif()
-    endif()
+    set(phy_name "phy")
 
     esptool_py_flash_target(${phy_name}-flash "${main_args}" "${sub_args}")
     esptool_py_flash_target_image(${phy_name}-flash ${phy_name} "${phy_partition_offset}" "${phy_init_data_bin}")
diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.phy_multiple_init_data b/tools/test_apps/system/build_test/sdkconfig.ci.phy_multiple_init_data
index b4d3f63c8..8136f0c24 100644
--- a/tools/test_apps/system/build_test/sdkconfig.ci.phy_multiple_init_data
+++ b/tools/test_apps/system/build_test/sdkconfig.ci.phy_multiple_init_data
@@ -1,3 +1,2 @@
 CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN=y
-CONFIG_IDF_TARGET="esp32"