Merge branch 'bugfix/fix_esp32s2_enable_multi_phy_init_data_bin_err' into 'master'

esp32s2: fix when enable multi phy init data bin compile err.

Closes IDF-1459

See merge request espressif/esp-idf!7936

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}")

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"