Skip to content

Commit a05d600

Browse files
esp-lqqwujiangang
esp-lqq
authored and
wujiangang
committed
feat(tools): Add xtensa-lx106-elf toolchain url
1 parent 7b40b23 commit a05d600

4 files changed

Lines changed: 140 additions & 119 deletions

File tree

‎export.sh‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# This script should be sourced, not executed.
2+
3+
function realpath_int() {
4+
wdir="$PWD"; [ "$PWD" = "/" ] && wdir=""
5+
arg=$1
6+
case "$arg" in
7+
/*) scriptdir="${arg}";;
8+
*) scriptdir="$wdir/${arg#./}";;
9+
esac
10+
scriptdir="${scriptdir%/*}"
11+
echo "$scriptdir"
12+
}
13+
14+
15+
function idf_export_main() {
16+
# The file doesn't have executable permissions, so this shouldn't really happen.
17+
# Doing this in case someone tries to chmod +x it and execute...
18+
if [[ -n "${BASH_SOURCE}" && ( "${BASH_SOURCE[0]}" == "${0}" ) ]]; then
19+
echo "This script should be sourced, not executed:"
20+
echo ". ${BASH_SOURCE[0]}"
21+
return 1
22+
fi
23+
24+
if [[ -z "${IDF_PATH}" ]]
25+
then
26+
# If using bash, try to guess IDF_PATH from script location
27+
if [[ -n "${BASH_SOURCE}" ]]
28+
then
29+
if [[ "$OSTYPE" == "darwin"* ]]; then
30+
script_dir="$(realpath_int $BASH_SOURCE)"
31+
else
32+
script_name="$(readlink -f $BASH_SOURCE)"
33+
script_dir="$(dirname $script_name)"
34+
fi
35+
export IDF_PATH="${script_dir}"
36+
else
37+
echo "IDF_PATH must be set before sourcing this script"
38+
return 1
39+
fi
40+
fi
41+
42+
old_path=$PATH
43+
44+
echo "Adding ESP-IDF tools to PATH..."
45+
# Call idf_tools.py to export tool paths
46+
export IDF_TOOLS_EXPORT_CMD=${IDF_PATH}/export.sh
47+
export IDF_TOOLS_INSTALL_CMD=${IDF_PATH}/install.sh
48+
idf_exports=$(${IDF_PATH}/tools/idf_tools.py export) || return 1
49+
eval "${idf_exports}"
50+
51+
echo "Checking if Python packages are up to date..."
52+
python ${IDF_PATH}/tools/check_python_dependencies.py || return 1
53+
54+
55+
# Allow calling some IDF python tools without specifying the full path
56+
# ${IDF_PATH}/tools is already added by 'idf_tools.py export'
57+
IDF_ADD_PATHS_EXTRAS="${IDF_PATH}/components/esptool_py/esptool"
58+
IDF_ADD_PATHS_EXTRAS="${IDF_ADD_PATHS_EXTRAS}:${IDF_PATH}/components/partition_table/"
59+
export PATH="${IDF_ADD_PATHS_EXTRAS}:${PATH}"
60+
61+
if [[ -n "$BASH" ]]
62+
then
63+
path_prefix=${PATH%%${old_path}}
64+
paths="${path_prefix//:/ }"
65+
if [ -n "${paths}" ]; then
66+
echo "Added the following directories to PATH:"
67+
else
68+
echo "All paths are already set."
69+
fi
70+
for path_entry in ${paths}
71+
do
72+
echo " ${path_entry}"
73+
done
74+
else
75+
echo "Updated PATH variable:"
76+
echo " ${PATH}"
77+
fi
78+
79+
# Clean up
80+
unset old_path
81+
unset paths
82+
unset path_prefix
83+
unset path_entry
84+
unset IDF_ADD_PATHS_EXTRAS
85+
unset idf_exports
86+
87+
# Not unsetting IDF_PYTHON_ENV_PATH, it can be used by IDF build system
88+
# to check whether we are using a private Python environment
89+
90+
echo "Done! You can now compile ESP8266-RTOS-SDK projects."
91+
echo "Go to the project directory and run:"
92+
echo ""
93+
echo " make"
94+
echo ""
95+
}
96+
97+
idf_export_main
98+
99+
unset realpath_int
100+
unset idf_export_main

‎install.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
set -u
5+
6+
export IDF_PATH=$(cd $(dirname $0); pwd)
7+
8+
echo "Installing ESP-IDF tools"
9+
${IDF_PATH}/tools/idf_tools.py install
10+
11+
echo "Installing Python environment and packages"
12+
${IDF_PATH}/tools/idf_tools.py install-python-env
13+
14+
basedir="$(dirname $0)"
15+
echo "All done! You can now run:"
16+
echo ""
17+
echo " . ${basedir}/export.sh"
18+
echo ""

‎tools/idf_tools.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ def get_python_env_path():
800800
idf_version = match.group(1)
801801

802802
idf_python_env_path = os.path.join(global_idf_tools_path, 'python_env',
803-
'idf{}_py{}_env'.format(idf_version, python_ver_major_minor))
803+
'rtos{}_py{}_env'.format(idf_version, python_ver_major_minor))
804804

805805
if sys.platform == 'win32':
806806
subdir = 'Scripts'
@@ -1066,7 +1066,7 @@ def action_install_python_env(args):
10661066
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--user', 'virtualenv'],
10671067
stdout=sys.stdout, stderr=sys.stderr)
10681068

1069-
subprocess.check_call([sys.executable, '-m', 'virtualenv', '--no-site-packages', idf_python_env_path],
1069+
subprocess.check_call([sys.executable, '-m', 'virtualenv', idf_python_env_path],
10701070
stdout=sys.stdout, stderr=sys.stderr)
10711071
run_args = [virtualenv_python, '-m', 'pip', 'install', '--no-warn-script-location']
10721072
requirements_txt = os.path.join(global_idf_path, 'requirements.txt')

‎tools/tools.json‎

Lines changed: 20 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,52 @@
11
{
22
"tools": [
33
{
4-
"description": "Toolchain for Xtensa (ESP32) based on GCC",
4+
"description": "Toolchain for Xtensa (ESP8266) based on GCC",
55
"export_paths": [
66
[
7-
"xtensa-esp32-elf",
7+
"xtensa-lx106-elf",
88
"bin"
99
]
1010
],
1111
"export_vars": {},
1212
"info_url": "https://github.com/espressif/crosstool-NG",
1313
"install": "always",
1414
"license": "GPL-3.0-with-GCC-exception",
15-
"name": "xtensa-esp32-elf",
15+
"name": "xtensa-lx106-elf",
1616
"version_cmd": [
17-
"xtensa-esp32-elf-gcc",
17+
"xtensa-lx106-elf-gcc",
1818
"--version"
1919
],
2020
"version_regex": "\\(crosstool-NG\\s+(?:crosstool-ng-)?([0-9a-z\\.\\-]+)\\)\\s*([0-9\\.]+)",
2121
"version_regex_replace": "\\1-\\2",
2222
"versions": [
2323
{
2424
"linux-amd64": {
25-
"sha256": "39db59b13f25e83e53c55f56979dbfce77b7f23126ad79de833509ad902d3f0a",
26-
"size": 63025996,
27-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-amd64.tar.gz"
28-
},
29-
"linux-armel": {
30-
"sha256": "4ffd19839fcb241af3111da7c419448b80be3bd844da570e95f8f3d5a7eccf79",
31-
"size": 61164309,
32-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-armel.tar.gz"
25+
"sha256": "706a02853759c2f85d912f68df4f5b4566ecb41422de5afe35a45d064eb8e494",
26+
"size": 37049855,
27+
"url": "https://dl.espressif.com/dl/xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz"
3328
},
3429
"linux-i686": {
35-
"sha256": "85c02a4310bb97ac46e6f943b0de10e9e9572596c7d33d09b6f93f8bace3b784",
36-
"size": 65016647,
37-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-i686.tar.gz"
38-
},
39-
"macos": {
40-
"sha256": "adb256394c948ca424ec6ef1d9bee91baa99a304d8ace8e6701303da952eb007",
41-
"size": 69674700,
42-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-macos.tar.gz"
43-
},
44-
"name": "esp32-2019r1-8.2.0",
45-
"status": "recommended",
46-
"win32": {
47-
"sha256": "ff00dbb02287219a61873c3b2649a50b94e80c82e607c336383f2838abbefbde",
48-
"size": 73245169,
49-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip"
50-
},
51-
"win64": {
52-
"sha256": "ff00dbb02287219a61873c3b2649a50b94e80c82e607c336383f2838abbefbde",
53-
"size": 73245169,
54-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip"
55-
}
56-
}
57-
]
58-
},
59-
{
60-
"description": "Toolchain for ESP32 ULP coprocessor",
61-
"export_paths": [
62-
[
63-
"esp32ulp-elf-binutils",
64-
"bin"
65-
]
66-
],
67-
"export_vars": {},
68-
"info_url": "https://github.com/espressif/binutils-esp32ulp",
69-
"install": "always",
70-
"license": "GPL-2.0-or-later",
71-
"name": "esp32ulp-elf",
72-
"version_cmd": [
73-
"esp32ulp-elf-as",
74-
"--version"
75-
],
76-
"version_regex": "\\(GNU Binutils\\)\\s+([0-9a-z\\.\\-]+)",
77-
"versions": [
78-
{
79-
"linux-amd64": {
80-
"sha256": "c1bbcd65e1e30c7312a50344c8dbc70c2941580a79aa8f8abbce8e0e90c79566",
81-
"size": 8246604,
82-
"url": "https://dl.espressif.com/dl/binutils-esp32ulp-linux64-2.28.51-esp32ulp-20180809.tar.gz"
30+
"sha256": "a94df9788a73a362f01f32a6f9d46b8630a0aab708eec8d6523e72342f382769",
31+
"size": 38388423,
32+
"url": "https://dl.espressif.com/dl/xtensa-lx106-elf-linux32-1.22.0-100-ge567ec7-5.2.0.tar.gz"
8333
},
8434
"macos": {
85-
"sha256": "c92937d85cc9a90eb6c6099ce767ca021108c18c94e34bd7b1fa0cde168f94a0",
86-
"size": 5726662,
87-
"url": "https://dl.espressif.com/dl/binutils-esp32ulp-macos-2.28.51-esp32ulp-20180809.tar.gz"
35+
"sha256": "4e3b2e6ba8ab7ff4dc4b70d90a181763b2077e4b6a69106241f8c175bab18184",
36+
"size": 43153405,
37+
"url": "https://dl.espressif.com/dl/xtensa-lx106-elf-macos-1.22.0-100-ge567ec7-5.2.0.tar.gz"
8838
},
89-
"name": "2.28.51.20170517",
39+
"name": "1.22.0-100-ge567ec7-5.2.0",
9040
"status": "recommended",
9141
"win32": {
92-
"sha256": "92dc83e69e534c9f73d7b939088f2e84f757d2478483415d17fe9dd1c236f2fd",
93-
"size": 12231559,
94-
"url": "https://dl.espressif.com/dl/binutils-esp32ulp-win32-2.28.51-esp32ulp-20180809.zip"
42+
"sha256": "0756bb6e768fb986ec557bf1136a8978e106d7d2cca1bbb21fca5d566a30e468",
43+
"size": 39567257,
44+
"url": "https://dl.espressif.com/dl/xtensa-lx106-elf-win32-1.22.0-100-ge567ec7-5.2.0.zip"
9545
},
9646
"win64": {
97-
"sha256": "92dc83e69e534c9f73d7b939088f2e84f757d2478483415d17fe9dd1c236f2fd",
98-
"size": 12231559,
99-
"url": "https://dl.espressif.com/dl/binutils-esp32ulp-win32-2.28.51-esp32ulp-20180809.zip"
47+
"sha256": "0756bb6e768fb986ec557bf1136a8978e106d7d2cca1bbb21fca5d566a30e468",
48+
"size": 39567257,
49+
"url": "https://dl.espressif.com/dl/xtensa-lx106-elf-win32-1.22.0-100-ge567ec7-5.2.0.zip"
10050
}
10151
}
10252
]
@@ -167,53 +117,6 @@
167117
}
168118
]
169119
},
170-
{
171-
"description": "OpenOCD for ESP32",
172-
"export_paths": [
173-
[
174-
"openocd-esp32",
175-
"bin"
176-
]
177-
],
178-
"export_vars": {
179-
"OPENOCD_SCRIPTS": "${TOOL_PATH}/openocd-esp32/share/openocd/scripts"
180-
},
181-
"info_url": "https://github.com/espressif/openocd-esp32",
182-
"install": "always",
183-
"license": "GPL-2.0-only",
184-
"name": "openocd-esp32",
185-
"version_cmd": [
186-
"openocd",
187-
"--version"
188-
],
189-
"version_regex": "Open On-Chip Debugger\\s+([a-z0-9.-]+)\\s+",
190-
"versions": [
191-
{
192-
"linux-amd64": {
193-
"sha256": "e5b5579edffde090e426b4995b346e281843bf84394f8e68c8e41bd1e4c576bd",
194-
"size": 1681596,
195-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20190313/openocd-esp32-linux64-0.10.0-esp32-20190313.tar.gz"
196-
},
197-
"macos": {
198-
"sha256": "09504eea5aa92646a117f16573c95b34e04b4010791a2f8fefcd2bd8c430f081",
199-
"size": 1760536,
200-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20190313/openocd-esp32-macos-0.10.0-esp32-20190313.tar.gz"
201-
},
202-
"name": "v0.10.0-esp32-20190313",
203-
"status": "recommended",
204-
"win32": {
205-
"sha256": "b86a7f9f39dfc4d8e289fc819375bbb7a5e9fcb8895805ba2b5faf67b8b25ce2",
206-
"size": 2098513,
207-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20190313/openocd-esp32-win32-0.10.0-esp32-20190313.zip"
208-
},
209-
"win64": {
210-
"sha256": "b86a7f9f39dfc4d8e289fc819375bbb7a5e9fcb8895805ba2b5faf67b8b25ce2",
211-
"size": 2098513,
212-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20190313/openocd-esp32-win32-0.10.0-esp32-20190313.zip"
213-
}
214-
}
215-
]
216-
},
217120
{
218121
"description": "menuconfig tool",
219122
"export_paths": [

0 commit comments

Comments
 (0)