Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update esptool version on docs and build system #14120

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Update esptool version on docs and build system #14120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/platforms/risc-v/esp32c3-legacy/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Building and flashing

First make sure that ``esptool.py`` is installed. This tool is used to convert
the ELF to a compatible ESP32 image and to flash the image into the board.
It can be installed with: ``pip install esptool==4.8.dev4``.
It can be installed with: ``pip install esptool``.

Configure the NuttX project: ``./tools/configure.sh esp32c3-devkit:nsh``
Run ``make`` to build the project. Note that the conversion mentioned above is
Expand Down
2 changes: 1 addition & 1 deletion Documentation/platforms/risc-v/esp32c3/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Building and flashing

First, make sure that ``esptool.py`` is installed. This tool is used to convert
the ELF to a compatible ESP32-C3 image and to flash the image into the board.
It can be installed with: ``pip install esptool==4.8.dev4``.
It can be installed with: ``pip install esptool``.

Configure the NuttX project: ``./tools/configure.sh esp32c3-generic:nsh``
Run ``make`` to build the project. Note that the conversion mentioned above is
Expand Down
2 changes: 1 addition & 1 deletion Documentation/platforms/risc-v/esp32c6/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Building and flashing

First, make sure that ``esptool.py`` is installed. This tool is used to convert
the ELF to a compatible ESP32-C6 image and to flash the image into the board.
It can be installed with: ``pip install esptool==4.8.dev4``.
It can be installed with: ``pip install esptool``.

Configure the NuttX project: ``./tools/configure.sh esp32c6-devkitc:nsh``
Run ``make`` to build the project. Note that the conversion mentioned above is
Expand Down
2 changes: 1 addition & 1 deletion Documentation/platforms/risc-v/esp32h2/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Building and flashing

First, make sure that ``esptool.py`` is installed. This tool is used to convert
the ELF to a compatible ESP32-H2 image and to flash the image into the board.
It can be installed with: ``pip install esptool==4.8.dev4``.
It can be installed with: ``pip install esptool``.

Configure the NuttX project: ``./tools/configure.sh esp32h2-devkit:nsh``
Run ``make`` to build the project. Note that the conversion mentioned above is
Expand Down
4 changes: 2 additions & 2 deletions Documentation/platforms/xtensa/esp32/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Building and Flashing

First, make sure that ``esptool.py`` is installed. This tool is used to convert the ELF to a
compatible ESP32 image and to flash the image into the board.
It can be installed with: ``pip install esptool==4.8.dev4``.
It can be installed with: ``pip install esptool``.

It's a two-step process where the first converts the ELF file into an ESP32 compatible binary
and the second flashes it to the board. These steps are included in the build system and it is
Expand Down Expand Up @@ -573,7 +573,7 @@ Prerequisites
First of all, we need to install ``imgtool`` (a MCUboot utility application to manipulate binary
images) and ``esptool`` (the ESP32 toolkit)::

$ pip install imgtool esptool==4.8.dev4
$ pip install imgtool esptool

We also need to make sure that the python modules are added to ``PATH``::

Expand Down
4 changes: 2 additions & 2 deletions Documentation/platforms/xtensa/esp32s2/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Building and Flashing

First, make sure that ``esptool.py`` is installed. This tool is used to convert the ELF to a
compatible ESP32-S2 image and to flash the image into the board.
It can be installed with: ``pip install esptool==4.8.dev4``.
It can be installed with: ``pip install esptool``.

It's a two-step process where the first converts the ELF file into an ESP32-S2 compatible binary
and the second flashes it to the board. These steps are included in the build system and it is
Expand Down Expand Up @@ -457,7 +457,7 @@ Prerequisites
First of all, we need to install ``imgtool`` (a MCUboot utility application to manipulate binary
images) and ``esptool`` (the ESP32-S2 toolkit)::

$ pip install imgtool esptool==4.8.dev4
$ pip install imgtool esptool

We also need to make sure that the python modules are added to ``PATH``::

Expand Down
2 changes: 1 addition & 1 deletion Documentation/platforms/xtensa/esp32s3/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Building and Flashing

First, make sure that ``esptool.py`` is installed. This tool is used to convert the ELF to a
compatible ESP32-S3 image and to flash the image into the board.
It can be installed with: ``pip install esptool==4.8.dev4``.
It can be installed with: ``pip install esptool``.

It's a two-step process where the first converts the ELF file into an ESP32-S3 compatible binary
and the second flashes it to the board. These steps are included in the build system and it is
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/docker/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ RUN pip3 install cmake-format
RUN pip3 install cvt2utf
# Install pytest
RUN pip3 install cxxfilt
RUN pip3 install esptool==4.8.dev4
RUN pip3 install esptool
RUN pip3 install imgtool
RUN pip3 install kconfiglib
RUN pip3 install pexpect==4.8.0
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/platforms/darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ python_tools() {
cmake-format \
cvt2utf \
cxxfilt \
esptool==4.8.dev4 \
esptool \
imgtool==1.9.0 \
kconfiglib \
pexpect==4.8.0 \
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/platforms/linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ python_tools() {
CodeChecker \
cvt2utf \
cxxfilt \
esptool==4.8.dev4 \
esptool \
imgtool \
kconfiglib \
pexpect==4.8.0 \
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/platforms/ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ python_tools() {
CodeChecker \
cvt2utf \
cxxfilt \
esptool==4.8.dev4 \
esptool \
imgtool \
kconfiglib \
pexpect==4.8.0 \
Expand Down
4 changes: 2 additions & 2 deletions tools/esp32/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ define MKIMAGE
$(Q) echo "MKIMAGE: ESP32 binary"
$(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \
echo "esptool.py not found. Please run: \"pip install esptool==4.8.dev4\""; \
echo "esptool.py not found. Please run: \"pip install esptool\""; \
echo ""; \
echo "Run make again to create the nuttx.bin image."; \
exit 1; \
Expand Down Expand Up @@ -270,7 +270,7 @@ define MKIMAGE
$(Q) echo "MKIMAGE: ESP32 binary"
$(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \
echo "esptool.py not found. Please run: \"pip install esptool==4.8.dev4\""; \
echo "esptool.py not found. Please run: \"pip install esptool\""; \
echo ""; \
echo "Run make again to create the nuttx.bin image."; \
exit 1; \
Expand Down
2 changes: 1 addition & 1 deletion tools/esp32c3/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ define MKIMAGE
$(Q) echo "MKIMAGE: ESP32-C3 binary"
$(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \
echo "esptool.py not found. Please run: \"pip install esptool==4.8.dev4\""; \
echo "esptool.py not found. Please run: \"pip install esptool\""; \
echo ""; \
echo "Run make again to create the nuttx.bin image."; \
exit 1; \
Expand Down
2 changes: 1 addition & 1 deletion tools/esp32s2/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ define MKIMAGE
$(Q) echo "MKIMAGE: ESP32-S2 binary"
$(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \
echo "esptool.py not found. Please run: \"pip install esptool==4.8.dev4\""; \
echo "esptool.py not found. Please run: \"pip install esptool\""; \
echo ""; \
echo "Run make again to create the nuttx.bin image."; \
exit 1; \
Expand Down
4 changes: 2 additions & 2 deletions tools/esp32s3/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ define MKIMAGE
$(Q) echo "MKIMAGE: ESP32-S3 binary"
$(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \
echo "esptool.py not found. Please run: \"pip install esptool==4.8.dev4\""; \
echo "esptool.py not found. Please run: \"pip install esptool\""; \
echo ""; \
echo "Run make again to create the nuttx.bin image."; \
exit 1; \
Expand Down Expand Up @@ -171,7 +171,7 @@ define MKIMAGE
$(Q) echo "MKIMAGE: ESP32-S3 binary"
$(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \
echo "esptool.py not found. Please run: \"pip install esptool==4.8.dev4\""; \
echo "esptool.py not found. Please run: \"pip install esptool\""; \
echo ""; \
echo "Run make again to create the nuttx.bin image."; \
exit 1; \
Expand Down
2 changes: 1 addition & 1 deletion tools/espressif/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ define MKIMAGE
$(Q) echo "MKIMAGE: NuttX binary"
$(Q) if ! esptool.py version 1>/dev/null 2>&1; then \
echo ""; \
echo "esptool.py not found. Please run: \"pip install esptool==4.8.dev4\""; \
echo "esptool.py not found. Please run: \"pip install esptool\""; \
echo ""; \
echo "Run make again to create the nuttx.bin image."; \
exit 1; \
Expand Down
Loading