From 9bbbb99907c79dc074c6482f0898059944f66a27 Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland@espressif.com>
Date: Fri, 13 May 2022 16:39:57 +0200
Subject: [PATCH 1/2] Tools: Fix esptool arguments and use flash size detection
 if selected

Closes https://github.com/espressif/esp-idf/issues/8798
---
 components/esptool_py/project_include.cmake | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/esptool_py/project_include.cmake b/components/esptool_py/project_include.cmake
index fee433ea1d..088b260571 100644
--- a/components/esptool_py/project_include.cmake
+++ b/components/esptool_py/project_include.cmake
@@ -26,7 +26,7 @@ set(ESPFLASHSIZE ${CONFIG_ESPTOOLPY_FLASHSIZE})
 
 set(ESPTOOLPY_CHIP "${chip_model}")
 
-set(ESPTOOLPY_FLASH_OPTIONS
+set(ELF2IMAGE_FLASH_OPTIONS
     --flash_mode ${ESPFLASHMODE}
     --flash_freq ${ESPFLASHFREQ}
     --flash_size ${ESPFLASHSIZE}
@@ -59,7 +59,7 @@ if(min_rev)
 endif()
 
 if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
-    # Set ESPFLASHSIZE to 'detect' *after* elf2image options are generated,
+    # Set ESPFLASHSIZE to 'detect' *after* ELF2IMAGE_FLASH_OPTIONS are generated,
     # as elf2image can't have 'detect' as an option...
     set(ESPFLASHSIZE detect)
 endif()
@@ -87,7 +87,7 @@ set(PROJECT_BIN "${elf_name}.bin")
 #
 if(CONFIG_APP_BUILD_GENERATE_BINARIES)
     add_custom_command(OUTPUT "${build_dir}/.bin_timestamp"
-        COMMAND ${ESPTOOLPY} elf2image ${ESPTOOLPY_FLASH_OPTIONS} ${esptool_elf2image_args}
+        COMMAND ${ESPTOOLPY} elf2image ${ELF2IMAGE_FLASH_OPTIONS} ${esptool_elf2image_args}
             -o "${build_dir}/${unsigned_project_binary}" "${elf_dir}/${elf}"
         COMMAND ${CMAKE_COMMAND} -E echo "Generated ${build_dir}/${unsigned_project_binary}"
         COMMAND ${CMAKE_COMMAND} -E md5sum "${build_dir}/${unsigned_project_binary}" > "${build_dir}/.bin_timestamp"
@@ -183,7 +183,8 @@ if(CONFIG_ESPTOOLPY_NO_STUB)
 endif()
 
 idf_component_set_property(esptool_py FLASH_ARGS "${esptool_flash_main_args}")
-idf_component_set_property(esptool_py FLASH_SUB_ARGS "${ESPTOOLPY_FLASH_OPTIONS}")
+idf_component_set_property(esptool_py FLASH_SUB_ARGS "--flash_mode ${ESPFLASHMODE} --flash_freq ${ESPFLASHFREQ} \
+--flash_size ${ESPFLASHSIZE}")
 
 function(esptool_py_partition_needs_encryption retencrypted partition_name)
     # Check if encryption is enabled

From 9c46c98b4c81699209fc9f44e3a3b1d94c5bf5b7 Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland@espressif.com>
Date: Wed, 25 May 2022 11:33:50 +0200
Subject: [PATCH 2/2] Tools: Don't add SHA256 digest to images when flash size
 detection is enabled

---
 components/esptool_py/Kconfig.projbuild     |  6 +++++-
 components/esptool_py/project_include.cmake | 13 +++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/components/esptool_py/Kconfig.projbuild b/components/esptool_py/Kconfig.projbuild
index 1709369b5a..b81a69ab8c 100644
--- a/components/esptool_py/Kconfig.projbuild
+++ b/components/esptool_py/Kconfig.projbuild
@@ -157,12 +157,16 @@ menu "Serial flasher config"
 
     config ESPTOOLPY_FLASHSIZE_DETECT
         bool "Detect flash size when flashing bootloader"
-        default y
+        default n
         help
             If this option is set, flashing the project will automatically detect
             the flash size of the target chip and update the bootloader image
             before it is flashed.
 
+            Enabling this option turns off the image protection against corruption
+            by a SHA256 digest. Updating the bootloader image before flashing would
+            invalidate the digest.
+
     choice ESPTOOLPY_BEFORE
         prompt "Before flashing"
         default ESPTOOLPY_BEFORE_RESET
diff --git a/components/esptool_py/project_include.cmake b/components/esptool_py/project_include.cmake
index 088b260571..2d1f4babd6 100644
--- a/components/esptool_py/project_include.cmake
+++ b/components/esptool_py/project_include.cmake
@@ -26,14 +26,14 @@ set(ESPFLASHSIZE ${CONFIG_ESPTOOLPY_FLASHSIZE})
 
 set(ESPTOOLPY_CHIP "${chip_model}")
 
-set(ELF2IMAGE_FLASH_OPTIONS
+set(esptool_elf2image_args
     --flash_mode ${ESPFLASHMODE}
     --flash_freq ${ESPFLASHFREQ}
     --flash_size ${ESPFLASHSIZE}
     )
 
 if(NOT BOOTLOADER_BUILD)
-    set(esptool_elf2image_args --elf-sha256-offset 0xb0)
+    list(APPEND esptool_elf2image_args --elf-sha256-offset 0xb0)
 endif()
 
 if(NOT CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION AND
@@ -59,9 +59,14 @@ if(min_rev)
 endif()
 
 if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
-    # Set ESPFLASHSIZE to 'detect' *after* ELF2IMAGE_FLASH_OPTIONS are generated,
+    # Set ESPFLASHSIZE to 'detect' *after* esptool_elf2image_args are generated,
     # as elf2image can't have 'detect' as an option...
     set(ESPFLASHSIZE detect)
+
+    # Flash size detection updates the image header which would invalidate the appended
+    # SHA256 digest. Therefore, a digest is not appended in that case.
+    # This argument requires esptool>=4.1.
+    set(esptool_elf2image_args --dont-append-digest)
 endif()
 
 if(CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME)
@@ -87,7 +92,7 @@ set(PROJECT_BIN "${elf_name}.bin")
 #
 if(CONFIG_APP_BUILD_GENERATE_BINARIES)
     add_custom_command(OUTPUT "${build_dir}/.bin_timestamp"
-        COMMAND ${ESPTOOLPY} elf2image ${ELF2IMAGE_FLASH_OPTIONS} ${esptool_elf2image_args}
+        COMMAND ${ESPTOOLPY} elf2image ${esptool_elf2image_args}
             -o "${build_dir}/${unsigned_project_binary}" "${elf_dir}/${elf}"
         COMMAND ${CMAKE_COMMAND} -E echo "Generated ${build_dir}/${unsigned_project_binary}"
         COMMAND ${CMAKE_COMMAND} -E md5sum "${build_dir}/${unsigned_project_binary}" > "${build_dir}/.bin_timestamp"