cmake: Fix bug where PHY partition offset incorrectly set

This commit is contained in:
Angus Gratton 2020-03-02 23:07:42 +11:00 committed by bot
parent ade22b2ae7
commit 1eaccfae4a
2 changed files with 1 additions and 6 deletions

View File

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

View File

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