From 0f503dee50d50604212bdb62069b483e1ed995b0 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 21 Nov 2017 19:30:52 +0800 Subject: [PATCH 1/2] toolchain: update to 1.22.0-75-gbaf03c2 - enable condition variable support in gthread - add provisions to allow emergency exception pool size to be configured --- docs/get-started/linux-setup.rst | 6 +++--- docs/get-started/macos-setup.rst | 4 ++-- docs/get-started/windows-setup-scratch.rst | 2 +- make/project.mk | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/get-started/linux-setup.rst b/docs/get-started/linux-setup.rst index 1c94510e1e..ec3dbf62a2 100644 --- a/docs/get-started/linux-setup.rst +++ b/docs/get-started/linux-setup.rst @@ -28,17 +28,17 @@ ESP32 toolchain for Linux is available for download from Espressif website: - for 64-bit Linux: - https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-73-ge28a011-5.2.0.tar.gz + https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-75-gbaf03c2-5.2.0.tar.gz - for 32-bit Linux: - https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-73-ge28a011-5.2.0.tar.gz + https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-75-gbaf03c2-5.2.0.tar.gz 1. Download this file, then extract it in ``~/esp`` directory:: mkdir -p ~/esp cd ~/esp - tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-73-ge28a011-5.2.0.tar.gz + tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-75-gbaf03c2-5.2.0.tar.gz .. _setup-linux-toolchain-add-it-to-path: diff --git a/docs/get-started/macos-setup.rst b/docs/get-started/macos-setup.rst index a4fe264a3b..3333ac17a7 100644 --- a/docs/get-started/macos-setup.rst +++ b/docs/get-started/macos-setup.rst @@ -19,13 +19,13 @@ Toolchain Setup ESP32 toolchain for macOS is available for download from Espressif website: -https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-73-ge28a011-5.2.0.tar.gz +https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-75-gbaf03c2-5.2.0.tar.gz Download this file, then extract it in ``~/esp`` directory:: mkdir -p ~/esp cd ~/esp - tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-73-ge28a011-5.2.0.tar.gz + tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-75-gbaf03c2-5.2.0.tar.gz .. _setup-macos-toolchain-add-it-to-path: diff --git a/docs/get-started/windows-setup-scratch.rst b/docs/get-started/windows-setup-scratch.rst index 9b5d4603ff..ac343ef1e0 100644 --- a/docs/get-started/windows-setup-scratch.rst +++ b/docs/get-started/windows-setup-scratch.rst @@ -78,7 +78,7 @@ Alternative Setup: Just download a toolchain If you already have an MSYS2 install or want to do things differently, you can download just the toolchain here: -https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-73-ge28a011-5.2.0.zip +https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-75-gbaf03c2-5.2.0.zip .. note:: diff --git a/make/project.mk b/make/project.mk index 76a9555cb0..a15b7d301e 100644 --- a/make/project.mk +++ b/make/project.mk @@ -525,7 +525,7 @@ TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|.*crosstool-ng-( TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(.*\)\ (.*)|\1|gp') # Officially supported version(s) -SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-73-ge28a011 +SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-75-gbaf03c2 SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0 ifdef TOOLCHAIN_COMMIT_DESC From 4d34251ff33d8cb67a4955705181b9f88b1eb427 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 23 Nov 2017 11:55:23 +1100 Subject: [PATCH 2/2] windows: Update precompiled env link & toolchain in setup script --- docs/get-started/windows-setup.rst | 2 +- tools/windows/windows_install_prerequisites.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/get-started/windows-setup.rst b/docs/get-started/windows-setup.rst index 51e42b4db4..858a7966af 100644 --- a/docs/get-started/windows-setup.rst +++ b/docs/get-started/windows-setup.rst @@ -13,7 +13,7 @@ Toolchain Setup The quick setup is to download the Windows all-in-one toolchain & MSYS2 zip file from dl.espressif.com: -https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20170918.zip +https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20171123.zip Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``C:\``) and it will create an ``msys32`` directory with a pre-prepared environment. diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh index e3f6cf9531..b43a7c5149 100644 --- a/tools/windows/windows_install_prerequisites.sh +++ b/tools/windows/windows_install_prerequisites.sh @@ -44,7 +44,7 @@ python -m pip install --upgrade pip pip install pyserial # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/ -TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-73-ge28a011-5.2.0.zip +TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-75-gbaf03c2-5.2.0.zip echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..." cd ~ curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}