From 1eaccfae4adae4938aac1d6ffab0ab652fdcd407 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 2 Mar 2020 23:07:42 +1100 Subject: [PATCH] cmake: Fix bug where PHY partition offset incorrectly set --- components/esptool_py/project_include.cmake | 6 ------ components/partition_table/project_include.cmake | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/components/esptool_py/project_include.cmake b/components/esptool_py/project_include.cmake index 2194bc62c4..eaa95ceaad 100644 --- a/components/esptool_py/project_include.cmake +++ b/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") diff --git a/components/partition_table/project_include.cmake b/components/partition_table/project_include.cmake index 03ee63b3fd..9d31a462bf 100644 --- a/components/partition_table/project_include.cmake +++ b/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")