From 7551e1d310f1ee7a89a48052b186a2b42bb8b15f Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 15 Sep 2017 09:24:27 +0800 Subject: [PATCH 1/2] make,docs: update toolchain to 1.22.0-72-g4d49225 --- 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 918e938e35..1e83e5e1cd 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-70-gfa0bad1-5.2.0.tar.gz + https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-73-ge28a011-5.2.0.tar.gz - for 32-bit Linux: - https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-70-gfa0bad1-5.2.0.tar.gz + https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-73-ge28a011-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-70-gfa0bad1-5.2.0.tar.gz + tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-73-ge28a011-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 0fdb4fc6da..a4fe264a3b 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-70-gfa0bad1-5.2.0.tar.gz +https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-73-ge28a011-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-70-gfa0bad1-5.2.0.tar.gz + tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-73-ge28a011-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 94f883d173..b750a6c559 100644 --- a/docs/get-started/windows-setup-scratch.rst +++ b/docs/get-started/windows-setup-scratch.rst @@ -72,7 +72,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-70-gfa0bad1-5.2.0.zip +https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-73-ge28a011-5.2.0.zip .. note:: diff --git a/make/project.mk b/make/project.mk index eb90b0a465..a12132c9fc 100644 --- a/make/project.mk +++ b/make/project.mk @@ -494,7 +494,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-70-gfa0bad1 +SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-73-ge28a011 SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0 ifdef TOOLCHAIN_COMMIT_DESC From 0db01b4a4d050ff2f4eb6c0a56cdca44fa6981c5 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 18 Sep 2017 18:26:57 +1000 Subject: [PATCH 2/2] windows: Update windows prereq script & precompiled environment download --- 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 6d4a5ab3fd..b5523e2124 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 & MSYS zip file from dl.espressif.com: -https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20170330.zip +https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20170918.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 5bdf280ee0..165977b0a5 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-70-gfa0bad1-5.2.0.zip +TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-73-ge28a011-5.2.0.zip echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..." cd ~ curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}