Commit Graph

262 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
b7ad0e0ad1 Merge branch 'bugfix/make_clean_files_v5.0' into 'release/v5.0'
build-system: replace ADDITIONAL_MAKE_CLEAN_FILES with ADDITIONAL_CLEAN_FILES (v5.0)

See merge request espressif/esp-idf!23662
2023-05-11 10:39:58 +08: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
Peter Dragun
9c4282ac5f feat(esptool): allow to set force for write_flash 2023-04-18 13:47:09 +02: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
Roland Dobai
c93c6317f5 Tools: Fix esptool wrappers by avoiding importing the module
Importing esptool in wrappers could cause importing the wrapper itself.
Updating the PATH is not reliable. For example, os.path.realpath()
changes the Windows driver letter to uppercase therefore, misses the
right path for users with small device letters in their PATH. Removing
paths without considering cases could also lead to errors.

This fix invokes esptool scripts as modules without the need to
importing them.

Closes https://github.com/espressif/esp-idf/issues/9861

Closes https://github.com/espressif/vscode-esp-idf-extension/issues/791
2022-11-21 15:20:14 +01:00
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
xiaqilin
b7b4fd44be esp32h2: disable no_stub option
It helps to enable erase flash feature for esp32h2beta2
2022-08-08 20:44:15 +08: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
2d08431433 Merge branch 'bugfix/flash_size_detect' into 'master'
Tools: Fix esptool flash size detection arguments

Closes IDFGH-7203

See merge request espressif/esp-idf!18100
2022-06-01 17:46:33 +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
Djordje Nedic
facab8c5a7 tools: Increase the minimal supported CMake version to 3.16
This updates the minimal supported version of CMake to 3.16, which in turn enables us to use more CMake features and have a cleaner build system.
This is the version that provides most new features and also the one we use in our latest docker image for CI.
2022-06-01 06:35:02 +00:00
Sachin Parekh
2c725264f7
esp32c2: Support Secure Boot V2 based on ECDSA scheme 2022-05-11 18:00:03 +05:30
Simon
e4d85807ea Merge branch 'feature/spi_flash_esp8684_support' into 'master'
spi_flash: refactor spi_flash clock configuration logic and support esp32c2

Closes IDF-4474, IDF-4025, and IDF-4066

See merge request espressif/esp-idf!16602
2022-04-27 11:05:45 +08:00
Cao Sen Miao
4418a855ba spi_flash: refactor the spi_flash clock configuration, and add support for esp32c2 2022-04-26 15:22:37 +08:00
radim.karnis
2bb7dc4471 esptool: Include as a package, delete submodule 2022-04-22 21:31:17 +02:00
Roland Dobai
3b161a40d6 esptool_py: Update to support ESP32-S3 USB OTG compressed flashing with stub 2022-04-12 08:53:12 +00:00
Cao Sen Miao
52e88a0073 spi_flash: esptool temporarily supports C2/H2 clock configurations 2022-04-11 10:46:02 +08:00
KonstantinKondrashov
47be69329b esptool: Update esptool submodule 2022-03-11 04:05:30 +00:00
Jiang Guang Ming
453146fe75 Merge branch 'bugfix/update_esp32c2_soc_memory_addr' into 'master'
soc: update memory address for esp32c2

See merge request espressif/esp-idf!17085
2022-02-22 10:23:35 +00:00
rudi ;-)
f242a1705a
add support for Flash 32MB..128MB (S2, S3)
ESP32-S2 and ESP32-S3
supports up to 1 GB of external flash and RAM
add support for
-    32MB
-    64MB
-    128MB ( example NOR spiFLASH 1G-BIT W25Q01JVZEIQ Winbond 0xEF 0x40 0x21 )

Merges https://github.com/espressif/esp-idf/pull/7688

Signed-off-by: Ivan Grokhotkov <ivan@espressif.com>
2022-02-21 10:26:41 +03:00
jiangguangming
0894a689cc esptool: update submodule esptool 2022-02-15 15:14:42 +08:00
KonstantinKondrashov
45d2d2470b efuse: Fixes eFuse timesettings issue on esp32S3 2022-01-25 22:09:14 +08:00
Roland Dobai
36a4011ff8 Tools: Custom baud-rate setup is not possible for IDF Monitor from menuconfig anymore
IDF Monitor follows the console baud rate by default. Other baud rate
can be set from command line by "idf.py monitor -B <baud>" or through
environment variables. Run "idf.py monitor --help" for more information.
2022-01-24 18:13:38 +01:00
Roland Dobai
aedb846a20 Tools: IDF Monitor follows the UART console baud rate by default 2022-01-24 18:13:38 +01:00
laokaiyao
cf049e15ed esp8684: rename target to esp32c2 2022-01-19 11:08:57 +08:00
Ivan Grokhotkov
1cbea5a504 Merge branch 'feature/espefuse_adds_args_to_execute_scripts_cmd' into 'master'
esptool/espefuse: execute_scripts can be run nested way

See merge request espressif/esp-idf!16411
2021-12-21 12:24:06 +00:00
KonstantinKondrashov
4cef1e2f8b esptool/espefuse: execute_scripts can be run nested way
Added args for execute_scripts cmd
Cleaned up only_burn_at_end args, it does not need anymore
2021-12-16 22:32:20 +08:00
Ivan Grokhotkov
6b361d923c esptool_py: fix quoting issues in run_serial_tool.cmake 2021-12-14 19:17:53 +01:00
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
laokaiyao
f21020ce04 esp32h2: update reg and struct for beta2 2021-11-24 12:34:17 +08:00
wuzhenghui
388615add0 update esp32h2beta2 chip_id to 14 2021-11-24 12:30:43 +08:00
wuzhenghui
968c42d88c 822 FPGA rnv init 2021-11-24 12:30:17 +08:00
Roland Dobai
766aa57084 Build & config: Remove leftover files from the unsupported "make" build system 2021-11-11 15:32:36 +01:00
Roland Dobai
9c1d4f5b54 Build & config: Remove the "make" build system
The "make" build system was deprecated in v4.0 in favor of idf.py
(cmake). The remaining support is removed in v5.0.
2021-11-10 09:53:53 +01:00
Cao Sen Miao
9ab043574d ESP8684: update esptool 2021-11-06 17:33:45 +08:00
Cao Sen Miao
7f5c415401 ESP8684: introduce a new target esp8684 2021-11-06 17:33:44 +08:00
Armando
f9fa38463a spi_flash: make 120m config only visible on s3 sdr mode 2021-10-28 19:36:34 +08:00
Armando
2655a506c9 mspi: support auto detect octal flash vendor 2021-10-08 15:59:57 +08:00