Commit Graph

82 Commits

Author SHA1 Message Date
Xiao Xufeng
c32a56fe3b spi_flash: fixed issue that enabling HPM-DC by default may cause app unable to restart 2024-03-03 23:11:43 +08:00
Arno Moonen
7d87f56e35 fix(build): fix build failure if CMAKE_EXECUTABLE_SUFFIX is set
From: Arno Moonen <arno.moonen@airios.eu>

Follows original message from Arno Moonen <arno.moonen@airios.eu>

While integrating the ESP-IDF into our existing CMake structure,
I've come across quite some hurdles. Most I've been able to fix
in our CMake files, however this one I could not.

Most of the targets created by the esptool_py component assume
that the EXECUTABLE IDF build property (which contains the name
of the CMake executable target) always equals the name of the
created binary.

This is however not always true. For instance, in our setup we use
CMAKE_EXECUTABLE_SUFFIX_C and CMAKE_EXECUTABLE_SUFFIX_CXX in our
toolchain file (both set to .elf). If we do add_executable(my_app),
the target binary file would actually be my_app.elf.

In order to fix this, I've updated it to use the TARGET_FILE generated
expression. That way we also no longer need the EXECUTABLE_DIR IDF build
property here.

I've fixed this on v5.0.1 (as that's the ESP-IDF version I'm currently
trying to integrate), but I assume it should be easy to apply the same
fix to newer versions and the master branch as well.

Note that this problem might exist in multiple places where EXECUTABLE
is being used. While going through the ESP-IDF code base, I even noticed
that a few places actually already seem to use the TARGET_FILE expression.
To be honest the property name might be somewhat confusing as well, as it
is actually the executable target.

Closes https://github.com/espressif/esp-idf/pull/12558
2023-11-22 14:44:18 +00:00
Marius Vikhammer
124a43e9ec build-system: replace ADDITIONAL_MAKE_CLEAN_FILES with ADDITIONAL_CLEAN_FILES
ADDITIONAL_MAKE_CLEAN_FILES is deprecated and only worked with make.
Replaced with the new ADDITIONAL_CLEAN_FILES (CMake 3.15) which also works with ninja.
2023-05-10 09:56:15 +08:00
Aditya Patwardhan
38917a36b5 Merge branch 'feature/add_bootloader_sector_pad_option_v5.0' into 'release/v5.0'
esptool_py: Added a --pad-to-size flag to align the bootloader image (v5.0)

See merge request espressif/esp-idf!21916
2023-02-17 19:02:52 +08:00
KonstantinKondrashov
823024c10c all: Apply new version logic (major * 100 + minor) 2023-01-06 02:00:52 +08:00
harshal.patil
536825dda1 esptool_py: Added a sector-pad option for bootloader image
When SECURE BOOT V2 is enabled and CONFIG_SECURE_BOOT_SIGNED_BINARIES
is not set, sector-pad the bootloader image, which is required for an
external PKCS#11 interface to generate a signature.
2023-01-05 13:39:57 +05:30
Mahavir Jain
21077eda8e esptool: (re)populate the secure boot signing key path
For project with reduced component list, secure boot signing key
path was not getting correctly. This change sets the secure boot
signing key path explicitly based on the relevant config option.

Closes https://github.com/espressif/esp-idf/issues/9578
Close IDFGH-8075
2022-10-01 15:05:29 +00:00
Cao Sen Miao
ec6a56ed0c spi_flash: re-enable the HPM mode on several XMC chips 2022-07-22 09:54:56 +08:00
Roland Dobai
9ee3661b4b tools: Generate images for ESP32-C2 with required minimal revision 2022-07-07 15:44:55 +08:00
Marius Vikhammer
50cfd7de22 Revert "Merge branch 'fix/esptool_esp32c2_minrev' into 'master'"
This reverts merge request !18633
2022-06-24 11:37:23 +08:00
Roland Dobai
78e6a04eae tools: Generate images for ESP32-C2 with required minimal revision 2022-06-22 13:28:24 +02:00
Roland Dobai
d56c578ddb tools: Rename the flash size detection kconfig option
9c46c98b4c have changed the default value
of ESPTOOLPY_FLASHSIZE_DETECT. As the side effect, existing
projects (having the option still enabled) started to discard the SHA256 digest.

Rename the ESPTOOLPY_FLASHSIZE_DETECT option so existing projects would
have the value disabled by default.

Closes https://github.com/espressif/esp-idf/issues/9148
2022-06-14 15:56:20 +02:00
Simon
6ad7558ec1 Merge branch 'feature/esp32c2_configurable_mmu_new' into 'master'
MMU: add configurable MMU page size support (For ESP32C2)

Closes IDF-3821

See merge request espressif/esp-idf!17854
2022-06-10 10:20:49 +08:00
Mahavir Jain
7dc0a1db18
esptool: fix elf2image conversion with "--dont-append-digest"
Append elf2image args so that "--dont-append-digest" do not override earlier
flash settings.

This was observed in case of ESP32-C2 image build where image build was failing
with `CONFIG_ESPTOOLPY_FLASHSIZE_DETECT`.

Related from earlier commit: 9c46c98b4c
2022-06-09 12:19:09 +05:30
Cao Sen Miao
6589daabb9 MMU: Add configurable mmu page size support on ESP32C2 2022-06-08 19:34:31 +08:00
Roland Dobai
9c46c98b4c Tools: Don't add SHA256 digest to images when flash size detection is enabled 2022-06-01 08:57:07 +02:00
Roland Dobai
9bbbb99907 Tools: Fix esptool arguments and use flash size detection if selected
Closes https://github.com/espressif/esp-idf/issues/8798
2022-06-01 08:57:07 +02:00
Sachin Parekh
2c725264f7
esp32c2: Support Secure Boot V2 based on ECDSA scheme 2022-05-11 18:00:03 +05:30
Ivan Grokhotkov
50799e3026 esptool_py: fix passing arguments to cmake -P
Fixes WORKING_DIRECTORY argument being passed with spaces escaped `\ `
which causes failure in run_cmd.cmake, since the WORKING_DIRECTORY is
interpreted as having a literal backslash character in it.
2021-12-14 19:17:53 +01:00
wuzhenghui
388615add0 update esp32h2beta2 chip_id to 14 2021-11-24 12:30:43 +08:00
Marius Vikhammer
19a492bc8d soc: add base support for ESP32-S3
Updates the following with changes from verification branches:

 * esp_rom linker files
 * rtc_cntl and system reg and struct headers

Also updates:
 * GDMA driver with new register layout
 * esptool submodule commit
2021-06-07 10:40:14 +08:00
Marius Vikhammer
9b4ba3d707 crypto: initial S3 Beta 3 bringup and testing for SHA/AES/RSA/flash enc 2021-05-18 11:25:41 +08:00
Ivan Grokhotkov
952c9a2d05 Merge branch 'feature/esptool_wrapper' into 'master'
tools: Support external Esptool wrappers

Closes IDFGH-5095

See merge request espressif/esp-idf!13389
2021-05-03 09:32:46 +00:00
Martin Babutzka
6faf4941cc tools: Support external Esptool wrappers
Implements https://github.com/jimparis/esptool-ftdi/issues/3

Closes https://github.com/espressif/esp-idf/pull/6879
2021-04-29 08:27:57 +02:00
Roland Dobai
3a948c1455 tools: Fix Cmake arguments for IDF Monitor
SERIAL_TOOL_ARGS is post-processed with the spaces2list cmake function.
Therefore, it should be a list of arguments because spaces are replaced
with semicolons.

Regression of b77addea2f and
c425ac7bed.

Closes https://github.com/espressif/esp-idf/issues/6946
2021-04-28 12:07:40 +02:00
Roland Dobai
c425ac7bed tools: Don't use revision argument for IDF Monitor if it is not defined 2021-04-15 19:56:39 +02:00
Martin Gaňo
b77addea2f Decompose idf_monitor.py 2021-04-12 10:47:33 +02:00
callalilychen
d9f687f51a esptool_py: call idf.py monitor with python explicitly
Closes https://github.com/espressif/esp-idf/pull/5314
2021-03-31 16:54:50 +08:00
Angus Gratton
10d1e4ab1b esp32c3: Add support for building image with a minimum target revision 2021-03-26 10:59:03 +08:00
Marius Vikhammer
2aead8ba57 Support ESP32S3 Beta 3 target
Update ROM API. Port changes from bringup branch.
2021-03-18 10:24:22 +08:00
Renz Bagaporo
55684fab72 esptool_py: use serial script for monitor 2020-12-17 11:25:32 +08:00
Renz Bagaporo
ca6c093d1a esptool_py: make script generic for serial ops 2020-12-17 11:25:32 +08:00
Omar Chebib
02ddecb69f buildsystem: flash binary to a named partition
Changed optional value parameter 'encrypted' to a named parameter
called 'ALWAYS_PLAINTEXT'. This flag can be passed to:
- esptool_py_flash_target
- esptool_py_flash_target_image
Fix wrong identation.
2020-12-08 12:16:02 +08:00
Omar Chebib
ccaee8ce88 buildsystem: flash binary to a named partition
Add support for CMake version less than 3.8. These versions don't
provide a way to have ternary expressions in expressions generator.
2020-11-26 10:04:34 +08:00
Omar Chebib
956538e364 buildsystem: flash binary to a named partition
- Add the function esptool_py_flash_to_partition to flash a binary
image to a named partition. If encryption is enabled, this function
will also determine if the partition needs to be encrypted or not
according the its type, subtype and flag in the CSV file (if any).
- Use idf.py encrypted-flash will now flash both encrypted and
non-encrypted file if any (spiffs for example) using esptool.py's
--encrypt-files option.

Closes IDF-2387
Relates to IDF-723
Relates to IDF-2231
2020-11-26 10:04:34 +08:00
Angus Gratton
66fb5a29bb Whitespace: Automated whitespace fixes (large commit)
Apply the pre-commit hook whitespace fixes to all files in the repo.

(Line endings, blank lines at end of file, trailing whitespace)
2020-11-11 07:36:35 +00:00
Angus Gratton
e95c8c1d66 Merge branch 'feature/esptool_allow_no_stub' into 'master'
Allow esptool's download stub to be disabled by other options and applications

See merge request espressif/esp-idf!10114
2020-09-26 01:25:53 +08:00
morris
0bb21281ca esp32s3: select esp32s3 beta version in menuconfig 2020-09-22 15:15:03 +08:00
me-no-dev
b64fd872bc Allow esptool's download stub to be disabled by other options and applications
Currently USB CDC Download requires the `--no-stub` option of `esptool`. This change inverts the Kconfig option to negative, so that it can be `selected` by other options or enabled in applications through `sdkconfig.defaults`.
2020-09-16 03:25:53 +00:00
Angus Gratton
d45eabe676 esptool: Add support for ESP32-S2 Secure Download Mode
* Pass --no-stub from build system if configured to enable ESP32-S2 Secure Download Mode
* Update esptool submodule
2020-05-28 17:52:15 +10:00
Ivan Grokhotkov
dfbf8ce518 Merge branch 'bugfix/display_partition_table' into 'master'
partition_table: do not always display partition table contents on build

See merge request espressif/esp-idf!8289
2020-05-04 14:51:32 +08:00
Renz Bagaporo
acb7a211dd partition_table: do not always display partition table contents on build 2020-04-08 11:38:43 +08:00
Renz Bagaporo
07f9978df7 cmake: add elf dir information
Solves https://www.esp32.com/viewtopic.php?f=13&t=14784&p=57557&hilit=assumes#p57557
2020-04-07 17:19:33 +08:00
Renz Christian Bagaporo
eb865008d5 cmake: show error message on encrypted flash targets without proper config 2020-03-02 07:18:22 +05:00
Supreet Deshpande
a9ccc5e5c8 feat/secure_boot_v2: Adding secure boot v2 support for ESP32-ECO3 2020-02-25 01:28:22 +05:30
Ivan Grokhotkov
09950797cb esptool_py: pass flash mode/frequency/size to elf2image
Otherwise the image gets generated with wrong parameters, and the
binary does not boot unless it has been "fixed" by esptool during the
upload.
2020-01-23 12:19:15 +01:00
Renz Christian Bagaporo
fd74ec75d7 esptool_py: retain flash targets when building RAM loadable apps 2020-01-15 03:36:47 +00:00
Renz Christian Bagaporo
cc8bff703e esptool_py: create flash target functions 2020-01-15 03:36:47 +00:00
Amit Sheth
8f3987099e project_include.cmake: Make esptool_py_custom_target callable from other directories 2019-12-19 17:53:09 +05:30
morris
5efb1140ac esptool: add chip and stub option 2019-12-09 09:48:16 +08:00