diff --git a/tools/test_idf_tools/test_idf_tools.py b/tools/test_idf_tools/test_idf_tools.py index 0c6f6f52d..df5d1aa21 100755 --- a/tools/test_idf_tools/test_idf_tools.py +++ b/tools/test_idf_tools/test_idf_tools.py @@ -72,7 +72,7 @@ class TestUsage(unittest.TestCase): idf_tools.main(['list']) output = output_stream.getvalue() - xtensa_esp32_elf_version = 'esp-2019r2-8.2.0' + xtensa_esp32_elf_version = 'esp-2020r1-8.2.0' esp32ulp_version = '2.28.51-esp-20191205' self.assertIn('* xtensa-esp32-elf:', output) diff --git a/tools/toolchain_versions.mk b/tools/toolchain_versions.mk index 9d3463ff2..8cb979425 100644 --- a/tools/toolchain_versions.mk +++ b/tools/toolchain_versions.mk @@ -1,6 +1,6 @@ -SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp-2019r2 +SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp-2020r1 SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 8.2.0 -CURRENT_TOOLCHAIN_COMMIT_DESC = esp-2019r2 -CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp-2019r2 +CURRENT_TOOLCHAIN_COMMIT_DESC = esp-2020r1 +CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp-2020r1 CURRENT_TOOLCHAIN_GCC_VERSION = 8.2.0 diff --git a/tools/tools.json b/tools/tools.json index 92b4c03d0..e66dc8fbe 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -22,36 +22,36 @@ "versions": [ { "linux-amd64": { - "sha256": "e6d47c1dbd8c8cbfe37271e5e2aac53ee88c9e347ae937e22bf0c73f530efbdf", - "size": 85459985, - "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz" + "sha256": "b65ae41a675c866f5e11e3c452fc4b9cee3f39038d88435faa45308f50388c54", + "size": 85490835, + "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-amd64.tar.gz" }, "linux-armel": { - "sha256": "54a199c28f591da2466b21741911bc2ba77ddf82d3d2b66c6ce03c1a0c6835f0", - "size": 83647538, - "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-armel.tar.gz" + "sha256": "7cd03edf067b5da6acf333ddaf18ce8070db98876c01b1d8979702e63587fcb5", + "size": 83653607, + "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-armel.tar.gz" }, "linux-i686": { - "sha256": "36a9648c414dbd1c518c687ce5587d9f8eaa94324f45d92e9ec31a1433a04df8", - "size": 87438500, - "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-i686.tar.gz" + "sha256": "19273eb069efb29cc1df129f667fc09571c8e6e0ffa1fc536fb8b5d14bd59d4b", + "size": 87449664, + "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-i686.tar.gz" }, "macos": { - "sha256": "dc62be8dd16c6d9d28d64e2b3f831fa208f3548c2ca73cdbcbdf68f474d59521", - "size": 92150978, - "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-macos.tar.gz" + "sha256": "a3ee69bbe23acb77242086d2445c62d6bf13dbd9abcdfd4b56acef0937051a12", + "size": 92170881, + "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-macos.tar.gz" }, - "name": "esp-2019r2-8.2.0", + "name": "esp-2020r1-8.2.0", "status": "recommended", "win32": { - "sha256": "c9d5776a22516f0825a7c68d835ffacc2392f913136893b7646e1288937cc65e", - "size": 103850448, - "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip" + "sha256": "5fbabd2b7c75f56ebe207061f56beb21aca32ef867b64e14e735065cf812cce4", + "size": 103877946, + "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-win32.zip" }, "win64": { - "sha256": "c9d5776a22516f0825a7c68d835ffacc2392f913136893b7646e1288937cc65e", - "size": 103850448, - "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip" + "sha256": "5fbabd2b7c75f56ebe207061f56beb21aca32ef867b64e14e735065cf812cce4", + "size": 103877946, + "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-win32.zip" } } ] @@ -78,36 +78,36 @@ "versions": [ { "linux-amd64": { - "sha256": "59c6951e39937b9dfa53cca6d7707984ee39572071e56d11069f032d079477f5", - "size": 85762044, - "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz" + "sha256": "f435159a654dbfd8ccc9f89a16d5ce523ebd9e04ae48d95bf4935d15ac7bd058", + "size": 85781628, + "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-amd64.tar.gz" }, "linux-armel": { - "sha256": "92d80cf640db34913b91c1d8dae1632a7f5a740b5dcf39a3bea750b5dba05caa", - "size": 84036647, - "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-linux-armel.tar.gz" + "sha256": "38081688e3d6d21b436adca9c790d8cdc9dd4dbd9e1a9c98262ea6b04639f8c1", + "size": 84055798, + "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-armel.tar.gz" }, "linux-i686": { - "sha256": "d31c39dce8e6faa36807152a8afa8fe79d491bc551ad27dff1fed2f31dd6a39e", - "size": 87755342, - "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-linux-i686.tar.gz" + "sha256": "38b685c3243ab991dd9112ef330ba1fa1a176ab68a6aca832a0fc76975b8916f", + "size": 87764133, + "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-i686.tar.gz" }, "macos": { - "sha256": "01f6d9b6d25a550975a16d2634a577a0c0f3c3c24db10edd1b714f9c192f490d", - "size": 92535775, - "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-macos.tar.gz" + "sha256": "f6ec427699930ccd17d730fb5bcb0daa2283bee83e0987cade45d8f0e1f6f544", + "size": 92539826, + "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-macos.tar.gz" }, - "name": "esp-2019r2-8.2.0", + "name": "esp-2020r1-8.2.0", "status": "recommended", "win32": { - "sha256": "f9b69732bd4e90d4558547f6a2d33f78433971e9e4f04968515cf460ea6de79a", - "size": 104254613, - "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-win32.zip" + "sha256": "a73a5b61510e730d7d0e46584f146a190b19627117e7657c92dccbedbf55ad68", + "size": 104292272, + "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-win32.zip" }, "win64": { - "sha256": "f9b69732bd4e90d4558547f6a2d33f78433971e9e4f04968515cf460ea6de79a", - "size": 104254613, - "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-win32.zip" + "sha256": "a73a5b61510e730d7d0e46584f146a190b19627117e7657c92dccbedbf55ad68", + "size": 104292272, + "url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-win32.zip" } } ] diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh index baf183898..b72529173 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_2_0-esp-2019r2-win32.zip +TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_2_0-esp-2020r1-win32.zip echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..." cd ~ curl -LO --retry 10 https://dl.espressif.com/dl/${TOOLCHAIN_ZIP}