浏览代码

Merge branch 'feature/esptool_fpga_slow_boot_flag' into 'master'

Propagate FPGA env var to esptool

See merge request espressif/esp-idf!14516
Roland Dobai 4 年之前
父节点
当前提交
fb78f131cd
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 1 1
      components/esptool_py/esptool
  2. 6 0
      components/esptool_py/run_serial_tool.cmake

+ 1 - 1
components/esptool_py/esptool

@@ -1 +1 @@
-Subproject commit 837c69028472f727574293fcee8d3f1cd5a8909e
+Subproject commit 5b6c6574a2c4b7dfa6dc07e17e68461dd2a2c145

+ 6 - 0
components/esptool_py/run_serial_tool.cmake

@@ -16,6 +16,12 @@ if(NOT SERIAL_TOOL OR NOT SERIAL_TOOL_ARGS)
         "strongly recommended to run ${SERIAL_TOOL} directly.")
 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,
 # because we want to expand them at flashing time not at CMake runtime (so they can change
 # without needing a CMake re-run)