From f84f30fe176010cde2e21fb06a41e17e99520e74 Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Fri, 17 Mar 2023 05:37:56 +0100 Subject: [PATCH] tools/ci: upgrade to the latest Xtensa ESP32 toolchains Signed-off-by: Petro Karashchenko --- tools/ci/cibuild.sh | 15 ++++++++------- tools/ci/docker/linux/Dockerfile | 12 ++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh index 19a830ed9a..8fd8e186c2 100755 --- a/tools/ci/cibuild.sh +++ b/tools/ci/cibuild.sh @@ -418,15 +418,16 @@ function xtensa-esp32-gcc-toolchain { cd "${tools}" case ${os} in Darwin) - wget --quiet https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-macos.tar.gz - tar xzf xtensa-esp32-elf-gcc8_4_0-esp-2021r1-macos.tar.gz - rm xtensa-esp32-elf-gcc8_4_0-esp-2021r1-macos.tar.gz + wget --quiet https://github.com/espressif/crosstool-NG/releases/download/esp-12.2.0_20230208/xtensa-esp32-elf-12.2.0_20230208-x86_64-apple-darwin.tar.xz + xz -d xtensa-esp32-elf-12.2.0_20230208-x86_64-apple-darwin.tar.xz + tar xf xtensa-esp32-elf-12.2.0_20230208-x86_64-apple-darwin.tar + rm xtensa-esp32-elf-12.2.0_20230208-x86_64-apple-darwin.tar ;; Linux) - wget --quiet https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_4_0-esp32-2021r1-linux-amd64.tar.xz - xz -d xtensa-esp32-elf-gcc8_4_0-esp32-2021r1-linux-amd64.tar.xz - tar xf xtensa-esp32-elf-gcc8_4_0-esp32-2021r1-linux-amd64.tar - rm xtensa-esp32-elf-gcc8_4_0-esp32-2021r1-linux-amd64.tar + wget --quiet 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 + xz -d xtensa-esp32-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz + tar xf xtensa-esp32-elf-12.2.0_20230208-x86_64-linux-gnu.tar + rm xtensa-esp32-elf-12.2.0_20230208-x86_64-linux-gnu.tar ;; esac fi diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index 99ada3ba25..d3266e7bca 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -189,16 +189,16 @@ RUN mkdir sparc-gaisler-elf-gcc && \ 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-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-linux-amd64.tar.gz" \ - | tar -C xtensa-esp32-elf-gcc --strip-components 1 -xz + 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-2021r1/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r1-linux-amd64.tar.gz" \ - | tar -C xtensa-esp32s2-elf-gcc --strip-components 1 -xz + 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-2021r1/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r1-linux-amd64.tar.gz" \ - | tar -C xtensa-esp32s3-elf-gcc --strip-components 1 -xz + 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 RUN echo "ESP Binaries: 2022/01/26" RUN mkdir -p /tools/blobs && cd /tools/blobs \