feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/esptool_fpga_slow_boot_flag' into 'master'

Browse Source 
Propagate FPGA env var to esptool

See merge request espressif/esp-idf!14516
This commit is contained in:
Roland Dobai
2021-07-28 15:30:53 +00:00
parent 97507ebe49 702c075d93
commit fb78f131cd
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esptool_py/esptool

Submodule components/esptool_py/esptool updated: 837c690284...5b6c6574a2

6
components/esptool_py/run_serial_tool.cmake
View File

@@ -16,6 +16,12 @@ if(NOT SERIAL_TOOL OR NOT SERIAL_TOOL_ARGS)
"strongly recommended to run ${SERIAL_TOOL} directly.") "strongly recommended to run ${SERIAL_TOOL} directly.")
endif() endif()
# Propagate the IDF_ENV_FPGA to esptool, for Espressif internal use only
if(DEFINED ENV{IDF_ENV_FPGA})
set(ENV{ESPTOOL_ENV_FPGA} 1)
message("Note: IDF_ENV_FPGA is set, propagating to esptool with ESPTOOL_ENV_FPGA = 1")
endif()
# Main purpose of this script: we can't expand these environment variables in the main IDF CMake build, # Main purpose of this script: we can't expand these environment variables in the main IDF CMake build,
# because we want to expand them at flashing time not at CMake runtime (so they can change # because we want to expand them at flashing time not at CMake runtime (so they can change
# without needing a CMake re-run) # without needing a CMake re-run)