Răsfoiți Sursa

idf.py: pass correct toolchain prefix to the monitor

Ivan Grokhotkov 6 ani în urmă
părinte
comite
7dcc5f4d15
2 a modificat fișierele cu 4 adăugiri și 1 ștergeri
  1. 3 1
      tools/cmake/project_description.json.in
  2. 1 0
      tools/idf.py

+ 3 - 1
tools/cmake/project_description.json.in

@@ -7,8 +7,10 @@
     "app_elf":            "${PROJECT_EXECUTABLE}",
     "app_bin":            "${PROJECT_BIN}",
     "git_revision":       "${IDF_VER}",
+    "target":             "${CONFIG_IDF_TARGET}",
     "phy_data_partition": "${CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION}",
-    "monitor_baud" : "${CONFIG_ESPTOOLPY_MONITOR_BAUD}",
+    "monitor_baud" :      "${CONFIG_ESPTOOLPY_MONITOR_BAUD}",
+    "monitor_toolprefix": "${CONFIG_SDK_TOOLPREFIX}",
     "config_environment" : {
         "COMPONENT_KCONFIGS" : "${COMPONENT_KCONFIGS}",
         "COMPONENT_KCONFIGS_PROJBUILD" : "${COMPONENT_KCONFIGS_PROJBUILD}"

+ 1 - 0
tools/idf.py

@@ -358,6 +358,7 @@ def monitor(action, ctx, args):
     if args.port is not None:
         monitor_args += ["-p", args.port]
     monitor_args += ["-b", project_desc["monitor_baud"]]
+    monitor_args += ["--toolchain-prefix", project_desc["monitor_toolprefix"]]
     monitor_args += [elf_file]
 
     idf_py = [PYTHON] + get_commandline_options(ctx)  # commands to re-run idf.py