diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index e326c07234c..0cb1c976d27 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -259,18 +259,10 @@ RUN mkdir -p sparc-gaisler-elf-gcc && \ # Build image for tool required by ESP32 builds ############################################################################### FROM nuttx-toolchain-base AS nuttx-toolchain-esp32 -# Download the latest ESP32 GCC toolchain prebuilt by Espressif -RUN mkdir -p xtensa-esp32-elf-gcc && \ - curl -s -L "https://github.com/espressif/crosstool-NG/releases/download/esp-12.2.0_20230208/xtensa-esp32-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz" \ - | tar -C xtensa-esp32-elf-gcc --strip-components 1 -xJ - -RUN mkdir -p xtensa-esp32s2-elf-gcc && \ - curl -s -L "https://github.com/espressif/crosstool-NG/releases/download/esp-12.2.0_20230208/xtensa-esp32s2-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz" \ - | tar -C xtensa-esp32s2-elf-gcc --strip-components 1 -xJ - -RUN mkdir -p xtensa-esp32s3-elf-gcc && \ - curl -s -L "https://github.com/espressif/crosstool-NG/releases/download/esp-12.2.0_20230208/xtensa-esp32s3-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz" \ - | tar -C xtensa-esp32s3-elf-gcc --strip-components 1 -xJ +# Download the latest ESP32, ESP32-S2 and ESP32-S3 GCC toolchain prebuilt by Espressif +RUN mkdir -p xtensa-esp-elf-gcc && \ + curl -s -L "https://github.com/espressif/crosstool-NG/releases/download/esp-14.2.0_20241119/xtensa-esp-elf-14.2.0_20241119-x86_64-linux-gnu.tar.xz" \ + | tar -C xtensa-esp-elf-gcc --strip-components 1 -xJ RUN echo "ESP Binaries: 2022/01/26" RUN mkdir -p /tools/blobs && cd /tools/blobs \ @@ -470,17 +462,9 @@ ENV PATH="/tools/riscv-none-elf-gcc/bin:$PATH" COPY --from=nuttx-toolchain-sparc /tools/sparc-gaisler-elf-gcc/ sparc-gaisler-elf-gcc/ ENV PATH="/tools/sparc-gaisler-elf-gcc/bin:$PATH" -# ESP32 toolchain -COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp32-elf-gcc/ xtensa-esp32-elf-gcc/ -ENV PATH="/tools/xtensa-esp32-elf-gcc/bin:$PATH" - -# ESP32-S2 toolchain -COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp32s2-elf-gcc/ xtensa-esp32s2-elf-gcc/ -ENV PATH="/tools/xtensa-esp32s2-elf-gcc/bin:$PATH" - -# ESP32-S3 toolchain -COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp32s3-elf-gcc/ xtensa-esp32s3-elf-gcc/ -ENV PATH="/tools/xtensa-esp32s3-elf-gcc/bin:$PATH" +# ESP32, ESP32-S2, ESP32-S3 toolchain +COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp-elf-gcc/ xtensa-esp-elf-gcc/ +ENV PATH="/tools/xtensa-esp-elf-gcc/bin:$PATH" RUN mkdir -p /tools/blobs/esp-bins COPY --from=nuttx-toolchain-esp32 /tools/blobs/* /tools/blobs/esp-bins/