espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-08 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_esp32s2_enable_multi_phy_init_data_bin_err' into 'master'

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

Closes IDF-1459

See merge request espressif/esp-idf!7936
This commit is contained in:
Jiang Jiang Jian
2020-03-13 19:47:00 +08:00
parent df56535b7a 5019419496
commit 57ad4afe7d
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/esp_wifi/CMakeLists.txt
View File

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

1
tools/test_apps/system/build_test/sdkconfig.ci.phy_multiple_init_data
View File

@@ -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"