@@ -259,18 +259,10 @@ RUN mkdir -p sparc-gaisler-elf-gcc && \
259259# Build image for tool required by ESP32 builds
260260# ##############################################################################
261261FROM nuttx-toolchain-base AS nuttx-toolchain-esp32
262- # Download the latest ESP32 GCC toolchain prebuilt by Espressif
263- RUN mkdir -p xtensa-esp32-elf-gcc && \
264- 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" \
265- | tar -C xtensa-esp32-elf-gcc --strip-components 1 -xJ
266-
267- RUN mkdir -p xtensa-esp32s2-elf-gcc && \
268- 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" \
269- | tar -C xtensa-esp32s2-elf-gcc --strip-components 1 -xJ
270-
271- RUN mkdir -p xtensa-esp32s3-elf-gcc && \
272- 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" \
273- | tar -C xtensa-esp32s3-elf-gcc --strip-components 1 -xJ
262+ # Download the latest ESP32, ESP32-S2 and ESP32-S3 GCC toolchain prebuilt by Espressif
263+ RUN mkdir -p xtensa-esp-elf-gcc && \
264+ 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" \
265+ | tar -C xtensa-esp-elf-gcc --strip-components 1 -xJ
274266
275267RUN echo "ESP Binaries: 2022/01/26"
276268RUN mkdir -p /tools/blobs && cd /tools/blobs \
@@ -470,17 +462,9 @@ ENV PATH="/tools/riscv-none-elf-gcc/bin:$PATH"
470462COPY --from=nuttx-toolchain-sparc /tools/sparc-gaisler-elf-gcc/ sparc-gaisler-elf-gcc/
471463ENV PATH="/tools/sparc-gaisler-elf-gcc/bin:$PATH"
472464
473- # ESP32 toolchain
474- COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp32-elf-gcc/ xtensa-esp32-elf-gcc/
475- ENV PATH="/tools/xtensa-esp32-elf-gcc/bin:$PATH"
476-
477- # ESP32-S2 toolchain
478- COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp32s2-elf-gcc/ xtensa-esp32s2-elf-gcc/
479- ENV PATH="/tools/xtensa-esp32s2-elf-gcc/bin:$PATH"
480-
481- # ESP32-S3 toolchain
482- COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp32s3-elf-gcc/ xtensa-esp32s3-elf-gcc/
483- ENV PATH="/tools/xtensa-esp32s3-elf-gcc/bin:$PATH"
465+ # ESP32, ESP32-S2, ESP32-S3 toolchain
466+ COPY --from=nuttx-toolchain-esp32 /tools/xtensa-esp-elf-gcc/ xtensa-esp-elf-gcc/
467+ ENV PATH="/tools/xtensa-esp-elf-gcc/bin:$PATH"
484468
485469RUN mkdir -p /tools/blobs/esp-bins
486470COPY --from=nuttx-toolchain-esp32 /tools/blobs/* /tools/blobs/esp-bins/
0 commit comments