Explorar o código

Merge branch 'bugfix/phy_partition_address_v3.3' into 'release/v3.3'

cmake: Fix bug where PHY partition offset incorrectly set (v3.1)

See merge request espressif/esp-idf!7837
Angus Gratton %!s(int64=6) %!d(string=hai) anos
pai
achega
cc34d5a5b0

+ 0 - 6
components/esptool_py/project_include.cmake

@@ -66,12 +66,6 @@ if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
     set(ESPFLASHSIZE detect)
 endif()
 
-# Set variables if the PHY data partition is in the flash
-if(CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION)
-    set(PHY_PARTITION_OFFSET   ${CONFIG_PHY_DATA_OFFSET})
-    set(PHY_PARTITION_BIN_FILE "esp32/phy_init_data.bin")
-endif()
-
 get_filename_component(IDF_PROJECT_NAME ${IDF_PROJECT_EXECUTABLE} NAME_WE)
 if(CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES AND NOT BOOTLOADER_BUILD)
     set(unsigned_project_binary "${IDF_PROJECT_NAME}-unsigned.bin")

+ 1 - 0
components/partition_table/project_include.cmake

@@ -45,6 +45,7 @@ function(get_partition_info variable get_part_info_args part_info)
     set(${variable} ${result} PARENT_SCOPE)
 endfunction()
 
+# Set variables if the PHY data partition is in the flash
 if(CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION)
     get_partition_info(PHY_PARTITION_OFFSET
                 "--partition-type data --partition-subtype phy" "offset")