kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'feature/toolchain-update' into 'master'
Toolchain update See merge request !1204pull/783/merge
commit
dfaf166436
|
@ -28,17 +28,17 @@ ESP32 toolchain for Linux is available for download from Espressif website:
|
||||||
|
|
||||||
- for 64-bit Linux:
|
- for 64-bit Linux:
|
||||||
|
|
||||||
https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz
|
https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-70-gfa0bad1-5.2.0.tar.gz
|
||||||
|
|
||||||
- for 32-bit Linux:
|
- for 32-bit Linux:
|
||||||
|
|
||||||
https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz
|
https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-70-gfa0bad1-5.2.0.tar.gz
|
||||||
|
|
||||||
1. Download this file, then extract it in ``~/esp`` directory::
|
1. Download this file, then extract it in ``~/esp`` directory::
|
||||||
|
|
||||||
mkdir -p ~/esp
|
mkdir -p ~/esp
|
||||||
cd ~/esp
|
cd ~/esp
|
||||||
tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz
|
tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-70-gfa0bad1-5.2.0.tar.gz
|
||||||
|
|
||||||
.. _setup-linux-toolchain-add-it-to-path:
|
.. _setup-linux-toolchain-add-it-to-path:
|
||||||
|
|
||||||
|
|
|
@ -19,13 +19,13 @@ Toolchain Setup
|
||||||
|
|
||||||
ESP32 toolchain for macOS is available for download from Espressif website:
|
ESP32 toolchain for macOS is available for download from Espressif website:
|
||||||
|
|
||||||
https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-61-gab8375a-5.2.0.tar.gz
|
https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-70-gfa0bad1-5.2.0.tar.gz
|
||||||
|
|
||||||
Download this file, then extract it in ``~/esp`` directory::
|
Download this file, then extract it in ``~/esp`` directory::
|
||||||
|
|
||||||
mkdir -p ~/esp
|
mkdir -p ~/esp
|
||||||
cd ~/esp
|
cd ~/esp
|
||||||
tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-61-gab8375a-5.2.0.tar.gz
|
tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-70-gfa0bad1-5.2.0.tar.gz
|
||||||
|
|
||||||
.. _setup-macos-toolchain-add-it-to-path:
|
.. _setup-macos-toolchain-add-it-to-path:
|
||||||
|
|
||||||
|
|
|
@ -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:
|
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-61-gab8375a-5.2.0.zip
|
https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-70-gfa0bad1-5.2.0.zip
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
|
|
|
@ -289,7 +289,6 @@ CXXFLAGS ?=
|
||||||
EXTRA_CXXFLAGS ?=
|
EXTRA_CXXFLAGS ?=
|
||||||
CXXFLAGS := $(strip \
|
CXXFLAGS := $(strip \
|
||||||
-std=gnu++11 \
|
-std=gnu++11 \
|
||||||
-fno-exceptions \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
$(OPTIMIZATION_FLAGS) $(DEBUG_FLAGS) \
|
$(OPTIMIZATION_FLAGS) $(DEBUG_FLAGS) \
|
||||||
$(COMMON_FLAGS) \
|
$(COMMON_FLAGS) \
|
||||||
|
@ -491,11 +490,11 @@ list-components:
|
||||||
# the part after the brackets is extracted into TOOLCHAIN_GCC_VER.
|
# the part after the brackets is extracted into TOOLCHAIN_GCC_VER.
|
||||||
ifdef CONFIG_TOOLPREFIX
|
ifdef CONFIG_TOOLPREFIX
|
||||||
ifndef MAKE_RESTARTS
|
ifndef MAKE_RESTARTS
|
||||||
TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(([^)]*).*|\1|gp')
|
TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|.*crosstool-ng-([0-9]+).([0-9]+).([0-9]+)-([0-9]+)-g([0-9a-f]{7}).*|\1.\2.\3-\4-g\5|gp')
|
||||||
TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(.*\)\ (.*)|\1|gp')
|
TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(.*\)\ (.*)|\1|gp')
|
||||||
|
|
||||||
# Officially supported version(s)
|
# Officially supported version(s)
|
||||||
SUPPORTED_TOOLCHAIN_COMMIT_DESC := crosstool-NG crosstool-ng-1.22.0-61-gab8375a
|
SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-70-gfa0bad1
|
||||||
SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0
|
SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0
|
||||||
|
|
||||||
ifdef TOOLCHAIN_COMMIT_DESC
|
ifdef TOOLCHAIN_COMMIT_DESC
|
||||||
|
|
|
@ -35,12 +35,16 @@ pacman --noconfirm -Syu # This step may require the terminal to be closed and re
|
||||||
|
|
||||||
pacman --noconfirm -S --needed gettext-devel gcc git make ncurses-devel flex bison gperf vim mingw-w64-i686-python2-pip unzip winpty
|
pacman --noconfirm -S --needed gettext-devel gcc git make ncurses-devel flex bison gperf vim mingw-w64-i686-python2-pip unzip winpty
|
||||||
|
|
||||||
|
# Workaround for errors when running "git submodule" commands
|
||||||
|
# See https://github.com/Alexpux/MSYS2-packages/issues/735
|
||||||
|
rm /mingw32/bin/envsubst.exe
|
||||||
|
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
|
|
||||||
pip install pyserial
|
pip install pyserial
|
||||||
|
|
||||||
# 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-61-gab8375a-5.2.0.zip
|
TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-70-gfa0bad1-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}
|
||||||
|
|
Ładowanie…
Reference in New Issue