Skip to content

Commit b56e9e7

Browse files
committed
fix(platform): Simplify toolchain selection
1 parent 2baa0dc commit b56e9e7

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

Diff for: .github/scripts/on-release.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,7 @@ sed "s/version=.*/version=$RELEASE_TAG/g" | \
229229
sed 's/tools\.esp32-arduino-libs\.path\.windows=.*//g' | \
230230
sed 's/{runtime\.platform\.path}.tools.esp32-arduino-libs/\{runtime.tools.esp32-arduino-libs.path\}/g' | \
231231
sed 's/{runtime\.platform\.path}.tools.xtensa-esp-elf-gdb/\{runtime.tools.xtensa-esp-elf-gdb.path\}/g' | \
232-
sed "s/{runtime\.platform\.path}.tools.xtensa-esp32-elf/\\{runtime.tools.$X32TC_NEW_NAME.path\\}/g" | \
233-
sed "s/{runtime\.platform\.path}.tools.xtensa-esp32s2-elf/\\{runtime.tools.$X32TC_NEW_NAME.path\\}/g" | \
234-
sed "s/{runtime\.platform\.path}.tools.xtensa-esp32s3-elf/\\{runtime.tools.$X32TC_NEW_NAME.path\\}/g" | \
232+
sed "s/{runtime\.platform\.path}.tools.xtensa-esp-elf/\\{runtime.tools.$X32TC_NEW_NAME.path\\}/g" | \
235233
sed 's/{runtime\.platform\.path}.tools.riscv32-esp-elf-gdb/\{runtime.tools.riscv32-esp-elf-gdb.path\}/g' | \
236234
sed "s/{runtime\.platform\.path}.tools.riscv32-esp-elf/\\{runtime.tools.$RVTC_NEW_NAME.path\\}/g" | \
237235
sed 's/{runtime\.platform\.path}.tools.esptool/\{runtime.tools.esptool_py.path\}/g' | \

Diff for: CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ endforeach()
293293
set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})
294294
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
295295
set(priv_includes cores/esp32/libb64)
296-
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser espressif__network_provisioning)
296+
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser esp_ringbuf esp_driver_gptimer esp_driver_usb_serial_jtag driver espressif__network_provisioning)
297297
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
298298

299299
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)

Diff for: platform.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ version=3.0.4
33

44
tools.esp32-arduino-libs.path={runtime.platform.path}/tools/esp32-arduino-libs
55
tools.esp32-arduino-libs.path.windows={runtime.platform.path}\tools\esp32-arduino-libs
6-
tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp-elf
7-
tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp-elf
8-
tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp-elf
6+
tools.xtensa-esp-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp-elf
97
tools.xtensa-esp-elf-gdb.path={runtime.platform.path}/tools/xtensa-esp-elf-gdb
108
tools.riscv32-esp-elf-gcc.path={runtime.platform.path}/tools/riscv32-esp-elf
119
tools.riscv32-esp-elf-gdb.path={runtime.platform.path}/tools/riscv32-esp-elf-gdb
@@ -27,7 +25,7 @@ tools.gen_esp32part.cmd.windows="{runtime.platform.path}\tools\gen_esp32part.exe
2725
tools.gen_insights_pkg.cmd=python3 "{runtime.platform.path}"/tools/gen_insights_package.py
2826
tools.gen_insights_pkg.cmd.windows="{runtime.platform.path}\tools\gen_insights_package.exe"
2927

30-
compiler.path={tools.{build.tarch}-{build.target}-elf-gcc.path}/bin/
28+
compiler.path={tools.{build.tarch}-esp-elf-gcc.path}/bin/
3129
compiler.prefix={build.tarch}-{build.target}-elf-
3230

3331
compiler.sdk.path={tools.esp32-arduino-libs.path}/{build.mcu}

0 commit comments

Comments
 (0)