Skip to content

Commit cb37eea

Browse files
committed
getting closer ;-)
1 parent 73b54da commit cb37eea

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

platform.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,10 @@ def configure_default_packages(self, variables, targets):
9797
# Starting from v12, Espressif's toolchains are shipped without
9898
# bundled GDB. Instead, it's distributed as separate packages for Xtensa
9999
# and RISC-V targets.
100-
for gdb_package in ("tl-xt-gdb", "tl-rv-gdb"):
101-
self.packages[gdb_package]["optional"] = False
102-
tl_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", gdb_package)
103-
# print("gdb path:", tl_path)
104-
if os.path.exists(tl_path):
100+
if os.path.exists(IDF_TOOLS):
101+
for gdb_package in ("tl-xt-gdb", "tl-rv-gdb"):
102+
tl_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", gdb_package)
103+
self.packages[gdb_package]["optional"] = False
105104
self.packages[gdb_package]["version"] = tl_path
106105

107106
# Common packages for IDF and mixed Arduino+IDF projects
@@ -127,10 +126,9 @@ def configure_default_packages(self, variables, targets):
127126
if mcu in ("esp32c2", "esp32c3", "esp32c6", "esp32h2"):
128127
self.packages.pop("tc-ulp", None)
129128
# RISC-V based toolchain for ESP32C3, ESP32C6 ESP32S2, ESP32S3 ULP
130-
self.packages["tc-rv32"]["optional"] = False
131-
rv32_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", "tc-rv32")
132-
if os.path.exists(rv32_path):
133-
self.packages["tc-rv32"]["owner"] = "espressif"
129+
if os.path.exists(IDF_TOOLS):
130+
rv32_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", "tc-rv32")
131+
self.packages["tc-rv32"]["optional"] = False
134132
self.packages["tc-rv32"]["version"] = rv32_path
135133

136134
return super().configure_default_packages(variables, targets)

0 commit comments

Comments
 (0)