diff --git a/tools/ci/platforms/ubuntu.sh b/tools/ci/platforms/ubuntu.sh index 8da2e6c9afc..3d03a4ca07c 100755 --- a/tools/ci/platforms/ubuntu.sh +++ b/tools/ci/platforms/ubuntu.sh @@ -325,15 +325,15 @@ sparc_gcc_toolchain() { command sparc-gaisler-elf-gcc --version } -xtensa_esp32_gcc_toolchain() { - add_path "${NUTTXTOOLS}"/xtensa-esp32-elf/bin +xtensa_esp_gcc_toolchain() { + add_path "${NUTTXTOOLS}"/xtensa-esp-elf/bin - if [ ! -f "${NUTTXTOOLS}/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc" ]; then + if [ ! -f "${NUTTXTOOLS}/xtensa-esp-elf/bin/xtensa-esp32-elf-gcc" ]; then local basefile - basefile=xtensa-esp32-elf-12.2.0_20230208-x86_64-linux-gnu + basefile=xtensa-esp-elf-14.2.0_20241119-x86_64-linux-gnu cd "${NUTTXTOOLS}" - # Download the latest ESP32 GCC toolchain prebuilt by Espressif - curl -O -L -s https://github.com/espressif/crosstool-NG/releases/download/esp-12.2.0_20230208/${basefile}.tar.xz + # Download the latest ESP32, ESP32-S2 and ESP32-S3 GCC toolchain prebuilt by Espressif + curl -O -L -s https://github.com/espressif/crosstool-NG/releases/download/esp-14.2.0_20241119/${basefile}.tar.xz xz -d ${basefile}.tar.xz tar xf ${basefile}.tar rm ${basefile}.tar @@ -342,40 +342,6 @@ xtensa_esp32_gcc_toolchain() { command xtensa-esp32-elf-gcc --version } -xtensa_esp32s2_gcc_toolchain() { - add_path "${NUTTXTOOLS}"/xtensa-esp32s2-elf/bin - - if [ ! -f "${NUTTXTOOLS}/xtensa-esp32s2-elf/bin/xtensa-esp32s2-elf-gcc" ]; then - local basefile - basefile=xtensa-esp32s2-elf-12.2.0_20230208-x86_64-linux-gnu - cd "${NUTTXTOOLS}" - # Download the latest ESP32 S2 GCC toolchain prebuilt by Espressif - curl -O -L -s https://github.com/espressif/crosstool-NG/releases/download/esp-12.2.0_20230208/${basefile}.tar.xz - xz -d ${basefile}.tar.xz - tar xf ${basefile}.tar - rm ${basefile}.tar - fi - - command xtensa-esp32s2-elf-gcc --version -} - -xtensa_esp32s3_gcc_toolchain() { - add_path "${NUTTXTOOLS}"/xtensa-esp32s3-elf/bin - - if [ ! -f "${NUTTXTOOLS}/xtensa-esp32s3-elf/bin/xtensa-esp32s3-elf-gcc" ]; then - local basefile - basefile=xtensa-esp32s3-elf-12.2.0_20230208-x86_64-linux-gnu - cd "${NUTTXTOOLS}" - # Download the latest ESP32 S3 GCC toolchain prebuilt by Espressif - curl -O -L -s https://github.com/espressif/crosstool-NG/releases/download/esp-12.2.0_20230208/${basefile}.tar.xz - xz -d ${basefile}.tar.xz - tar xf ${basefile}.tar - rm ${basefile}.tar - fi - - command xtensa-esp32s3-elf-gcc --version -} - u_boot_tools() { if ! type mkimage > /dev/null 2>&1; then sudo apt-get install -y u-boot-tools @@ -448,7 +414,7 @@ install_build_tools() { mkdir -p "${NUTTXTOOLS}" echo "#!/usr/bin/env sh" > "${NUTTXTOOLS}"/env.sh - install="arm_clang_toolchain arm_gcc_toolchain arm64_gcc_toolchain avr_gcc_toolchain binutils bloaty clang_tidy gen_romfs gperf kconfig_frontends mips_gcc_toolchain python_tools riscv_gcc_toolchain rust dlang rx_gcc_toolchain sparc_gcc_toolchain xtensa_esp32_gcc_toolchain xtensa_esp32s2_gcc_toolchain xtensa_esp32s3_gcc_toolchain u_boot_tools util_linux wasi_sdk c_cache" + install="arm_clang_toolchain arm_gcc_toolchain arm64_gcc_toolchain avr_gcc_toolchain binutils bloaty clang_tidy gen_romfs gperf kconfig_frontends mips_gcc_toolchain python_tools riscv_gcc_toolchain rust dlang rx_gcc_toolchain sparc_gcc_toolchain xtensa_esp_gcc_toolchain u_boot_tools util_linux wasi_sdk c_cache" oldpath=$(cd . && pwd -P) for func in ${install}; do