alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/flash_detect_new_project' into 'master'

Browse Source 
tools: Rename the flash size detection kconfig option

Closes IDFGH-7593

See merge request espressif/esp-idf!18505
This commit is contained in:
Roland Dobai 2022-06-15 19:14:38 +08:00
commit 62fe93f9ad
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esptool_py/Kconfig.projbuild
View File

@ -155,7 +155,7 @@ menu "Serial flasher config"
default "64MB" if ESPTOOLPY_FLASHSIZE_64MB default "64MB" if ESPTOOLPY_FLASHSIZE_64MB
default "128MB" if ESPTOOLPY_FLASHSIZE_128MB default "128MB" if ESPTOOLPY_FLASHSIZE_128MB
config ESPTOOLPY_FLASHSIZE_DETECT config ESPTOOLPY_HEADER_FLASHSIZE_UPDATE
bool "Detect flash size when flashing bootloader" bool "Detect flash size when flashing bootloader"
default n default n
help help

2
components/esptool_py/project_include.cmake
View File

@ -63,7 +63,7 @@ if(min_rev)
unset(min_rev) unset(min_rev)
endif() endif()
if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT) if(CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE)
# Set ESPFLASHSIZE to 'detect' *after* esptool_elf2image_args are generated, # Set ESPFLASHSIZE to 'detect' *after* esptool_elf2image_args are generated,
# as elf2image can't have 'detect' as an option... # as elf2image can't have 'detect' as an option...
set(ESPFLASHSIZE detect) set(ESPFLASHSIZE detect)

5
docs/en/migration-guides/tools.rst
View File

@ -35,3 +35,8 @@ Deprecated commands
- erase-otadata - erase-otadata
* - read_otadata * - read_otadata
- read-otadata - read-otadata
Esptool
-------
The CONFIG_ESPTOOLPY_FLASHSIZE_DETECT option has been renamed to :ref:`CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE` and it is disabled by default. New and existing projects migrated to ESP-IDF v5.0 will have to set :ref:`CONFIG_ESPTOOLPY_FLASHSIZE`. If this is not possible because the flash size is not known at build time then :ref:`CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE` can be enabled but this will have the consequence of not appending a SHA256 digest after the image in order that the binary header could be updated with the flash size during flashing without invalidating the digest.