Update toolchain to 1.22.0-97-gc752ad5

Revert a part of PSRAM workaround because of regression
    Add a C++ locale fix for multithreading
This commit is contained in:
Anton Maklakov 2020-09-08 20:18:49 +07:00
parent d8456c621e
commit 81da2bae2a
5 changed files with 27 additions and 27 deletions

View file

@ -58,7 +58,7 @@ Python 安装完成后,打开 Windows 开始菜单下的 Command Prompt
从 dl.espressif.com 下载预编译的 Windows 平台工具链: 从 dl.espressif.com 下载预编译的 Windows 平台工具链:
https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-96-g2852398-5.2.0.zip https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip
解压压缩包文件到 ``C:\Program Files`` (或其他地址)。压缩包文件包含 ``xtensa-esp32-elf`` 目录。 解压压缩包文件到 ``C:\Program Files`` (或其他地址)。压缩包文件包含 ``xtensa-esp32-elf`` 目录。

View file

@ -1,6 +1,6 @@
SUPPORTED_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-96-g2852398 SUPPORTED_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-97-gc752ad5
SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 5.2.0 SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 5.2.0
CURRENT_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-96-g2852398 CURRENT_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-97-gc752ad5
CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = 1.22.0-96-g2852398 CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = 1.22.0-97-gc752ad5
CURRENT_TOOLCHAIN_GCC_VERSION = 5.2.0 CURRENT_TOOLCHAIN_GCC_VERSION = 5.2.0

View file

@ -21,41 +21,41 @@
"version_regex_replace": "\\1-\\2", "version_regex_replace": "\\1-\\2",
"versions": [ "versions": [
{ {
"name": "1.22.0-96-g28523988-5.2.0", "name": "1.22.0-97-gc752ad58-5.2.0",
"status": "recommended", "status": "recommended",
"win32": { "win32": {
"sha256": "8e2a2e25d4714ae6e4b992be1b1c261caed5b523b0cc0887b6749229c9febbb0", "sha256": "80571e5d5a63494f4fa758bb9d8fb882ba4059853a8c412a84d232dc1c1400e6",
"size": 125810912, "size": 125747216,
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-96-g2852398-5.2.0.zip" "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip"
}, },
"win64": { "win64": {
"sha256": "8e2a2e25d4714ae6e4b992be1b1c261caed5b523b0cc0887b6749229c9febbb0", "sha256": "80571e5d5a63494f4fa758bb9d8fb882ba4059853a8c412a84d232dc1c1400e6",
"size": 125810912, "size": 125747216,
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-96-g2852398-5.2.0.zip" "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip"
} }
}, },
{ {
"linux-amd64": { "linux-amd64": {
"sha256": "798a8638f11ad37f41b9640582f869c61ffb4da6d932279fde94a2b636ad2dac", "sha256": "96f5f6e7611a0ed1dc47048c54c3113fc5cebffbf0ba90d8bfcd497afc7ef9f3",
"size": 44211883, "size": 44225380,
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-96-g2852398-5.2.0.tar.gz" "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz"
}, },
"linux-armel": { "linux-armel": {
"sha256": "abfe06522f7c3479f6c7434c4bf926c50fa2039362b96abe95fa1f05ec519a9b", "sha256": "d70d550f88448fa476b29fa50ef5502ab497a16ac7fa9ca24c6d0a39bb1e681e",
"size": 50670980, "size": 50657803,
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux-armel-1.22.0-96-g2852398-5.2.0.tar.gz" "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux-armel-1.22.0-97-gc752ad5-5.2.0.tar.gz"
}, },
"linux-i686": { "linux-i686": {
"sha256": "4eea601188aa8f3c3d45d7936ab4c0fabb75b4970dccf7a061de47dba49e377f", "sha256": "8094a2c30b474e99ce64dd0ba8f310c4614eb3b3cac884a3aea0fd5f565af119",
"size": 45563578, "size": 45575521,
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-96-g2852398-5.2.0.tar.gz" "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz"
}, },
"macos": { "macos": {
"sha256": "6aeae9547f0cd7e442d1df21821cea8b15d0a6ce349bbd86466e2997b738a99c", "sha256": "b1ce39a563ae359cf363fb7d8ee80cb1e5226fda83188203cff60f16f55e33ef",
"size": 50520203, "size": 50525386,
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-macos-1.22.0-96-g2852398-5.2.0.tar.gz" "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz"
}, },
"name": "1.22.0-96-g2852398-5.2.0", "name": "1.22.0-97-gc752ad5-5.2.0",
"status": "recommended" "status": "recommended"
} }
] ]

View file

@ -21,7 +21,7 @@ if [ "$1" != "--no-download" ]; then
cd `dirname $0` cd `dirname $0`
pushd dl pushd dl
wget --continue "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-96-g2852398-5.2.0.zip" wget --continue "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip"
wget --continue "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp32ulp-20180809/binutils-esp32ulp-win32-2.28.51-esp32ulp-20180809.zip" wget --continue "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp32ulp-20180809/binutils-esp32ulp-win32-2.28.51-esp32ulp-20180809.zip"
wget --continue "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20180920/openocd-esp32-win32-0.10.0-esp32-20180920.zip" wget --continue "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20180920/openocd-esp32-win32-0.10.0-esp32-20180920.zip"
wget --continue "https://github.com/espressif/kconfig-frontends/releases/download/v4.6.0.0-idf-20180525/mconf-v4.6.0.0-idf-20180525-win32.zip" wget --continue "https://github.com/espressif/kconfig-frontends/releases/download/v4.6.0.0-idf-20180525/mconf-v4.6.0.0-idf-20180525-win32.zip"
@ -30,7 +30,7 @@ if [ "$1" != "--no-download" ]; then
rm -rf input/* rm -rf input/*
pushd input pushd input
unzip ../dl/xtensa-esp32-elf-win32-1.22.0-96-g2852398-5.2.0.zip unzip ../dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip
unzip ../dl/mconf-v4.6.0.0-idf-20180525-win32.zip unzip ../dl/mconf-v4.6.0.0-idf-20180525-win32.zip
unzip ../dl/binutils-esp32ulp-win32-2.28.51-esp32ulp-20180809.zip unzip ../dl/binutils-esp32ulp-win32-2.28.51-esp32ulp-20180809.zip
unzip ../dl/openocd-esp32-win32-0.10.0-esp32-20180920.zip unzip ../dl/openocd-esp32-win32-0.10.0-esp32-20180920.zip

View file

@ -42,7 +42,7 @@ if [ -n "$IDF_PATH" ]; then
fi fi
# Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/ # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-96-g2852398-5.2.0.zip TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip
echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..." echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
cd ~ cd ~
curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP} curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}