From 6e48d5bd6b78c146f8273c06f3c317d5f5c98d97 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Thu, 16 Sep 2021 08:13:16 +0700 Subject: [PATCH 1/3] coredump: update test data for toolchain 2021r2 --- components/espcoredump/test/expected_output | 46 ++++++++++----------- tools/test_idf_monitor/tests/core1_out.txt | 46 ++++++++++----------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/components/espcoredump/test/expected_output b/components/espcoredump/test/expected_output index e0a4212712..6b253277e4 100644 --- a/components/espcoredump/test/expected_output +++ b/components/espcoredump/test/expected_output @@ -20,12 +20,12 @@ eps4 0x60820 eps5 0x0 eps6 0x0 eps7 0x0 -pc 0x400d0e45 0x400d0e45 -lbeg 0x400014fd 1073747197 -lend 0x4000150d 1073747213 -lcount 0xffffffff 4294967295 -sar 0x0 0 -ps 0x60820 395296 +pc 0x400d0e45 0x400d0e45 +lbeg 0x400014fd 1073747197 +lend 0x4000150d 1073747213 +lcount 0xffffffff 4294967295 +sar 0x0 0 +ps 0x60820 395296 threadptr br scompare1 @@ -41,22 +41,22 @@ f64r_hi f64s fcr fsr -a0 0x800d0e20 -2146628064 -a1 0x3ffbaad0 1073457872 -a2 0x2 2 -a3 0x3ffbab1c 1073457948 -a4 0x3ffbab10 1073457936 -a5 0x3ffae970 1073408368 -a6 0x0 0 -a7 0x0 0 -a8 0x5 5 -a9 0xffffffad -83 -a10 0x20 32 -a11 0x3ffb62e0 1073439456 -a12 0x1 1 -a13 0x80 128 -a14 0x1 1 -a15 0x0 0 +a0 0x800d0e20 -2146628064 +a1 0x3ffbaad0 1073457872 +a2 0x2 2 +a3 0x3ffbab1c 1073457948 +a4 0x3ffbab10 1073457936 +a5 0x3ffae970 1073408368 +a6 0x0 0 +a7 0x0 0 +a8 0x5 5 +a9 0xffffffad -83 +a10 0x20 32 +a11 0x3ffb62e0 1073439456 +a12 0x1 1 +a13 0x80 128 +a14 0x1 1 +a15 0x0 0 ==================== CURRENT THREAD STACK ===================== #0 0x400d0e45 in recur_func () at /home/alexey/projects/esp/esp-idf/components/espcoredump/test/test_core_dump.c:61 @@ -66,7 +66,7 @@ a15 0x0 0 #4 0x40088160 in xthal_restore_extra_nw () at /Users/igrokhotkov/e/esp32/hal/hal/state_asm.S:97 ======================== THREADS INFO ========================= - Id Target Id Frame + Id Target Id Frame * 1 process 1073439328 0x400d0e45 in recur_func () at /home/alexey/projects/esp/esp-idf/components/espcoredump/test/test_core_dump.c:61 2 process 1073455736 0x400092dc in ?? () 3 process 1073444404 0x400e85b2 in intrusive_list::intrusive_list (this=0x0) at /home/alexey/projects/esp/esp-idf/components/nvs_flash/src/intrusive_list.h:33 diff --git a/tools/test_idf_monitor/tests/core1_out.txt b/tools/test_idf_monitor/tests/core1_out.txt index f32be3f9e0..a04ccfea4c 100644 --- a/tools/test_idf_monitor/tests/core1_out.txt +++ b/tools/test_idf_monitor/tests/core1_out.txt @@ -56,12 +56,12 @@ eps3 0x0 eps4 0x0 eps5 0x0 eps6 0x0 -pc 0x400e37f7 0x400e37f7 -lbeg 0x0 0 -lend 0x0 0 -lcount 0x0 0 -sar 0x14 20 -ps 0x60420 394272 +pc 0x400e37f7 0x400e37f7 +lbeg 0x0 0 +lend 0x0 0 +lcount 0x0 0 +sar 0x14 20 +ps 0x60420 394272 threadptr br scompare1 @@ -77,22 +77,22 @@ f64r_hi f64s fcr fsr -a0 0x800d0c31 -2146628559 -a1 0x3ffb5db0 1073438128 -a2 0x1 1 -a3 0x1 1 -a4 0x1 1 -a5 0x60023 393251 -a6 0x1 1 -a7 0x60023 393251 -a8 0x1 1 -a9 0x0 0 -a10 0x7fffffff 2147483647 -a11 0x8001f880 -2147354496 -a12 0x6ff1ff8 117383160 -a13 0x0 0 -a14 0x3ffb7d80 1073446272 -a15 0x0 0 +a0 0x800d0c31 -2146628559 +a1 0x3ffb5db0 1073438128 +a2 0x1 1 +a3 0x1 1 +a4 0x1 1 +a5 0x60023 393251 +a6 0x1 1 +a7 0x60023 393251 +a8 0x1 1 +a9 0x0 0 +a10 0x7fffffff 2147483647 +a11 0x8001f880 -2147354496 +a12 0x6ff1ff8 117383160 +a13 0x0 0 +a14 0x3ffb7d80 1073446272 +a15 0x0 0 ==================== CURRENT THREAD STACK ===================== #0 0x400e37f7 in ?? () @@ -100,7 +100,7 @@ a15 0x0 0 #2 0x40087018 in ?? () ======================== THREADS INFO ========================= - Id Target Id Frame + Id Target Id Frame * 1 process 1073438336 0x400e37f7 in ?? () 2 process 1073442120 0x40087010 in ?? () 3 process 1073440228 0x40087010 in ?? () From c0e96ceb34a7f32fe58a89b8347fda3291594eee Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Thu, 14 Oct 2021 08:44:00 +0700 Subject: [PATCH 2/3] test_apps/panic: remove workaround for incorrect GDB backtrace --- tools/test_apps/system/panic/panic_tests.py | 26 ++++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/tools/test_apps/system/panic/panic_tests.py b/tools/test_apps/system/panic/panic_tests.py index c890f4ae7d..93d196ea66 100644 --- a/tools/test_apps/system/panic/panic_tests.py +++ b/tools/test_apps/system/panic/panic_tests.py @@ -51,13 +51,13 @@ def task_wdt_inner(env, test_name): dut.expect_backtrace() dut.expect_elf_sha256() dut.expect_none('Guru Meditation') - if ('gdbstub' in test_name): - test_common(dut, test_name, expected_backtrace=[ - # Backtrace interrupted when abort is called, IDF-842 - 'panic_abort', 'esp_system_abort' - ]) - else: - test_common(dut, test_name) + test_common(dut, test_name, + expected_backtrace=['panic_abort', + 'esp_system_abort', + 'abort', + 'task_wdt_isr', + '_xt_lowint1'] + + get_default_backtrace(dut.test_name)) def int_wdt_inner(env, test_name): @@ -105,13 +105,11 @@ def abort_inner(env, test_name): dut.expect_backtrace() dut.expect_elf_sha256() dut.expect_none('Guru Meditation', 'Re-entered core dump') - if ('gdbstub' in test_name): - test_common(dut, test_name, expected_backtrace=[ - # Backtrace interrupted when abort is called, IDF-842 - 'panic_abort', 'esp_system_abort' - ]) - else: - test_common(dut, test_name) + test_common(dut, test_name, + expected_backtrace=['panic_abort', + 'esp_system_abort', + 'abort'] + + get_default_backtrace(dut.test_name)) def abort_cached_disabled_inner(env, test_name): From 798b52af1d8f9d3539bbe263a3b5ba76e3718b30 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Thu, 9 Sep 2021 14:01:14 +0700 Subject: [PATCH 3/3] Update toolchains to esp-2021r2 Updated GDB to 9.2 version for xtensa chips Fixed coredump work for xtensa chips Fixed backtrace for xtensa chips Fixed multilib for riscv32 chips Fixed running GDB on some RaspberryPi configuration for riscv32 chip Fixed support of fnmatch(), iconv() and some other posix functions in stdlib Closes https://github.com/espressif/esp-idf/issues/6124 Closes https://github.com/espressif/esp-idf/issues/2484 Closes https://github.com/espressif/esp-idf/issues/3264 Closes https://github.com/espressif/crosstool-NG/issues/13 Closes https://github.com/espressif/crosstool-NG/pull/16 --- tools/test_idf_tools/test_idf_tools.py | 23 +-- tools/toolchain_versions.mk | 6 +- tools/tools.json | 172 ++++++++++-------- .../windows/windows_install_prerequisites.sh | 2 +- 4 files changed, 106 insertions(+), 97 deletions(-) diff --git a/tools/test_idf_tools/test_idf_tools.py b/tools/test_idf_tools/test_idf_tools.py index 516d1064fc..670daad96a 100755 --- a/tools/test_idf_tools/test_idf_tools.py +++ b/tools/test_idf_tools/test_idf_tools.py @@ -1,18 +1,7 @@ #!/usr/bin/env python # -# Copyright 2019 Espressif Systems (Shanghai) PTE LTD -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: Apache-2.0 import os import shutil @@ -57,10 +46,10 @@ XTENSA_ESP32S3_ELF = 'xtensa-esp32s3-elf' ESP32ULP_VERSION = '2.28.51-esp-20191205' ESP32S2ULP_VERSION = '2.28.51-esp-20191205' OPENOCD_VERSION = 'v0.10.0-esp32-20210902' -RISC_VERSION = 'esp-2021r1-8.4.0' -XTENSA_ESP32_ELF_VERSION = 'esp-2021r1-8.4.0' -XTENSA_ESP32S2_ELF_VERSION = 'esp-2021r1-8.4.0' -XTENSA_ESP32S3_ELF_VERSION = 'esp-2021r1-8.4.0' +RISC_VERSION = 'esp-2021r2-8.4.0' +XTENSA_ESP32_ELF_VERSION = 'esp-2021r2-8.4.0' +XTENSA_ESP32S2_ELF_VERSION = 'esp-2021r2-8.4.0' +XTENSA_ESP32S3_ELF_VERSION = 'esp-2021r2-8.4.0' class TestUsage(unittest.TestCase): diff --git a/tools/toolchain_versions.mk b/tools/toolchain_versions.mk index 1f2f64ec15..05dfd3e4f6 100644 --- a/tools/toolchain_versions.mk +++ b/tools/toolchain_versions.mk @@ -1,6 +1,6 @@ -SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp-2021r1 +SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp-2021r2 SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 8.4.0 -CURRENT_TOOLCHAIN_COMMIT_DESC = esp-2021r1 -CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp-2021r1 +CURRENT_TOOLCHAIN_COMMIT_DESC = esp-2021r2 +CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp-2021r2 CURRENT_TOOLCHAIN_GCC_VERSION = 8.4.0 diff --git a/tools/tools.json b/tools/tools.json index 496ba36e69..4de2c27d32 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -25,36 +25,41 @@ "versions": [ { "linux-amd64": { - "sha256": "44a0b467b9d2b759ab48b2f27aed684581f33c96e2842992781c4e045992c5b0", - "size": 86361217, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-linux-amd64.tar.gz" + "sha256": "3eb3d68b27fa6ba5af6f88da21cb8face9be0094daaa8960793cfe570ab785ff", + "size": 90565318, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-linux-amd64.tar.gz" + }, + "linux-arm64": { + "sha256": "aa534be24e45e06b7080a6a3bb8cd9e3cfb818f5f8bce2244d7cfb5e91336541", + "size": 86860292, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-linux-arm64.tar.gz" }, "linux-armel": { - "sha256": "fdacdb2a7bbf6293bcafda9b52463a4da8a2f3b7e1df9f83d35ff9d1efa22012", - "size": 84520407, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-linux-armel.tar.gz" + "sha256": "f0e49ce06fe7833ff5d76961dc2dac5449d320f823bb8c05a302cf85a3a6eb04", + "size": 86183421, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-linux-armel.tar.gz" }, "linux-i686": { - "sha256": "e2024096492dfaa50fc6ac336cd8faa2e395e8cebb617753eab0b5f16d3dd0dc", - "size": 88375391, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-linux-i686.tar.gz" + "sha256": "06de09b74652de43e5b22db3b7fc992623044baa75e9faaab68317a986715ba3", + "size": 92582250, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-linux-i686.tar.gz" }, "macos": { - "sha256": "7bbc6a2b94f009cd8a3351b9c7acf7a5caa1c4d3700500ead60f84965386a61b", - "size": 93357296, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-macos.tar.gz" + "sha256": "96443f69c8569417c780ee749d91ef33cffe22153fffa30a0fbf12107d87381b", + "size": 97808961, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-macos.tar.gz" }, - "name": "esp-2021r1-8.4.0", + "name": "esp-2021r2-8.4.0", "status": "recommended", "win32": { - "sha256": "e4f9fdda192abfc9807e3e7fcd6e9fea30c1a0cf3f3c5a5c961b5114fc8c9b7e", - "size": 105603626, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-win32.zip" + "sha256": "076a4171bdc33e5ced3952efffb233d70263dfa760e636704050597a9edf61db", + "size": 112578260, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-win32.zip" }, "win64": { - "sha256": "f28f525f6554d72fcd60bdc67b6f095d6c022df6036c3c3166dace37d6ea10b3", - "size": 108318363, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-win64.zip" + "sha256": "c35b7998f7f503e0cb22055d1e279ae14b6b0e09bb3ff3846b17d552ece9c247", + "size": 115278695, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-win64.zip" } } ] @@ -84,36 +89,41 @@ "versions": [ { "linux-amd64": { - "sha256": "b127baccfe6949ee7eaf3d0782ea772750a9b8e2732b16ce6bcc9dcd91f7209a", - "size": 86687290, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r1-linux-amd64.tar.gz" + "sha256": "a6e0947c92b823ca04f062522249f0a428357e0b056f1ff4c6bcabef83cf63a7", + "size": 90901736, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-linux-amd64.tar.gz" + }, + "linux-arm64": { + "sha256": "d2e5600fc194b508bd393b236a09fd62ed70afb6c36619d4b106b696a56ca66d", + "size": 87176557, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-linux-arm64.tar.gz" }, "linux-armel": { - "sha256": "7ca0d240f11e1c53c01a56257b0c968f876ab405142d1068d8c9b456d939554c", - "size": 84916701, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r1-linux-armel.tar.gz" + "sha256": "3fff4199e986dd74660f17ca27d9414cb98f1b911a7f13bb3b22e784cb1156cf", + "size": 86581102, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-linux-armel.tar.gz" }, "linux-i686": { - "sha256": "9941f993ff84d1c606b45ffbeeb7bcdc5a72cf24e787bb9230390510fe3511c6", - "size": 88699953, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r1-linux-i686.tar.gz" + "sha256": "7732f9fb371d36b6b324820e300beecc33c2719921a61cf1cdb5bc625016b346", + "size": 92875986, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-linux-i686.tar.gz" }, "macos": { - "sha256": "4b55b1a9ca7fc945be6fc3513802b6cece9264bee4cbca76013569cec2695973", - "size": 93757895, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r1-macos.tar.gz" + "sha256": "e6dd32782fcff8f633299b97d1c671d6b6513390aca2ddbd7543c2cc62e72d7e", + "size": 98212907, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-macos.tar.gz" }, - "name": "esp-2021r1-8.4.0", + "name": "esp-2021r2-8.4.0", "status": "recommended", "win32": { - "sha256": "c94ec1e45c81b7e4944d216bab4aa41d46849768d7761fd691661dab1a3df828", - "size": 106013515, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r1-win32.zip" + "sha256": "41b917b35f6fbe7d30b7de91c32cf348c406acfa729a1eabc450d040dc46fbe2", + "size": 113022469, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-win32.zip" }, "win64": { - "sha256": "2a2a04e45a7dfe93356a2329162f7d013f06e3125fd7fc08a50e3bd5f4110300", - "size": 108698715, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r1-win64.zip" + "sha256": "a764c1a0ee743d69f8cbfadbe4426a2c15c0e233b0894244c7cadf3b4d7dd32a", + "size": 115696999, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-win64.zip" } } ] @@ -143,36 +153,41 @@ "versions": [ { "linux-amd64": { - "sha256": "36e3a1bc48d9866d1ad9a7fc7d12381604b85fb311b7780a847d63ac8444dd04", - "size": 86699731, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r1-linux-amd64.tar.gz" + "sha256": "b958eb47f51fc2a91e3beda78a331a380eb8c96d5452f7795adf3f565d7fca2f", + "size": 90887465, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-linux-amd64.tar.gz" + }, + "linux-arm64": { + "sha256": "5fb122f1109a0b1aa7a42b6b48f56c854c0a84d13047a3bb0a78bdc737bf70e2", + "size": 87047917, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-linux-arm64.tar.gz" }, "linux-armel": { - "sha256": "5108571286f8403cc06d951efdfa20e36ace9ee37bc19892cc1c04b52cc2fe83", - "size": 84778877, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r1-linux-armel.tar.gz" + "sha256": "d618be508629749110785ce0038b35959cc4e6953629e2dc6d65697425b905e1", + "size": 86448074, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-linux-armel.tar.gz" }, "linux-i686": { - "sha256": "dc126b60f4492689d675f66a60a74c63e80ac5fbb345cf541c323a0a2592541d", - "size": 88720642, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r1-linux-i686.tar.gz" + "sha256": "9701907da616992079d302acf5a04f97361b39ca3e74112690b2c896875f3a62", + "size": 92888291, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-linux-i686.tar.gz" }, "macos": { - "sha256": "0887e2ff3ac20d36f6754e4f27a5e888b48db603e1026859f257f466e2569824", - "size": 94156313, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r1-macos.tar.gz" + "sha256": "d417885a5d150d94b3b84f68460b7af399a789cb0c7c632e222feed666c8aaea", + "size": 98564027, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-macos.tar.gz" }, - "name": "esp-2021r1-8.4.0", + "name": "esp-2021r2-8.4.0", "status": "recommended", "win32": { - "sha256": "6fb1e5b6f9606052af545176616441e00fdff64314a97b29ce349f28e5bfbab3", - "size": 106006033, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r1-win32.zip" + "sha256": "d2d76c69b267767d7caf01f152cf0d1dbb9facba0e9bd2cbcad5130253a14e5f", + "size": 112979829, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-win32.zip" }, "win64": { - "sha256": "652305fc18ad653a32b00ac2de4af26c27a6c94ed39deaf09df21975a5957694", - "size": 108872018, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r1-win64.zip" + "sha256": "9c04d1da09c600b380f323b01c15e3ec511053db7d0c161085081a3fa812dc1e", + "size": 115825020, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-win64.zip" } } ] @@ -202,36 +217,41 @@ "versions": [ { "linux-amd64": { - "sha256": "3459618f33bbd5f54d7d7783e807cb6eef6472a220f2f1eb3faced735b9d13bb", - "size": 152812483, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/riscv32-esp-elf-gcc8_4_0-esp-2021r1-linux-amd64.tar.gz" + "sha256": "812d735063da9d063b374b59f55832a96c41fbd27ddaef19000a75de8607ba21", + "size": 106837189, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/riscv32-esp-elf-gcc8_4_0-esp-2021r2-linux-amd64.tar.gz" + }, + "linux-arm64": { + "sha256": "712f1fbc3e08304a6f32aa18b346b16bbcb413b507b3d4c7c3211bf0d7dc4813", + "size": 103273444, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/riscv32-esp-elf-gcc8_4_0-esp-2021r2-linux-arm64.tar.gz" }, "linux-armel": { - "sha256": "24b9e54b348bbd5fb816fc4c52abb47337c702beecdbba840750b7cfb9d38069", - "size": 151726623, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/riscv32-esp-elf-gcc8_4_0-esp-2021r1-linux-armel.tar.gz" + "sha256": "80a3342cda2cd4b6b75ebb2b36d5d12fce7d375cfadadcff01ec3a907f0a16a2", + "size": 103058744, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/riscv32-esp-elf-gcc8_4_0-esp-2021r2-linux-armel.tar.gz" }, "linux-i686": { - "sha256": "954d340ebffef12a2ce9be1ea004e6f45a8863f1e6f41f46fd3f04f58499627c", - "size": 155430963, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/riscv32-esp-elf-gcc8_4_0-esp-2021r1-linux-i686.tar.gz" + "sha256": "7f0162a81558ab0ed09d6c5d356def25b5cb3d5c2d61358f20152fa260ccc8ae", + "size": 109447789, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/riscv32-esp-elf-gcc8_4_0-esp-2021r2-linux-i686.tar.gz" }, "macos": { - "sha256": "612fb3a3f84f703222327bd16581df8f80fda8cdf137637fe5d611587d1b664e", - "size": 159836199, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/riscv32-esp-elf-gcc8_4_0-esp-2021r1-macos.tar.gz" + "sha256": "3ff7e5427907cf8e271c1f959b70fb01e39625c3caf61a6567e7b38aa0c11578", + "size": 113672945, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/riscv32-esp-elf-gcc8_4_0-esp-2021r2-macos.tar.gz" }, - "name": "esp-2021r1-8.4.0", + "name": "esp-2021r2-8.4.0", "status": "recommended", "win32": { - "sha256": "527f5f258c28a1fce6264a4f8dcb63fbfbd1e810881783497eccd101ca38cb07", - "size": 195148877, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/riscv32-esp-elf-gcc8_4_0-esp-2021r1-patch1-win32.zip" + "sha256": "c8ff08883c1456c278fad85e1c43b7c6e251d525683214168655550e85c5b82e", + "size": 140809778, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/riscv32-esp-elf-gcc8_4_0-esp-2021r2-win32.zip" }, "win64": { - "sha256": "8e8e3e385833960762e9f007bc3f7785daf282deb0c8a4dfdd6340b2cce556b0", - "size": 197027915, - "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/riscv32-esp-elf-gcc8_4_0-esp-2021r1-patch1-win64.zip" + "sha256": "6c04cb4728db928ec6473e63146b695b6dec686a0d40dd73dd3353f05247b19e", + "size": 142365782, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/riscv32-esp-elf-gcc8_4_0-esp-2021r2-win64.zip" } } ] diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh index 5a5faebe1f..8adcee0468 100644 --- a/tools/windows/windows_install_prerequisites.sh +++ b/tools/windows/windows_install_prerequisites.sh @@ -42,7 +42,7 @@ if [ -n "$IDF_PATH" ]; then fi # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/ -TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_4_0-esp-2021r1-win32.zip +TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_4_0-esp-2021r2-win32.zip echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..." cd ~ curl -LO --retry 10 https://dl.espressif.com/dl/${TOOLCHAIN_ZIP}