commit 54ef484afac4cd018afcf26848de5de6ab6ca18f
author Almir Okato <almir.okato@espressif.com> Tue Mar 07 17:56:53 2023 -0300
committer almir-okato <66885489+almir-okato@users.noreply.github.com> Mon Jul 24 10:03:18 2023 -0300
tree 6c2d3814af07a46bd2edce049019b57d712a578c
parent 26ed3f448f98d6cf3867fee29235961ecdb997e0

espressif: remove IDF git submodule and add its reference by param

Remove the ESP-IDF from git submodules to avoid potential
duplicated repo clones on the user system. IDF HAL code is still
a dependency for Espressif port, therefore now the HAL code
reference needs to be passed by parameter when building.

The Espressif port was also updated to work with last v5.1 IDF
code.

Signed-off-by: Almir Okato <almir.okato@espressif.com>

boot/espressif/port/esp_mcuboot.c

diff --git a/boot/espressif/port/esp_mcuboot.c b/boot/espressif/port/esp_mcuboot.c
index ea0661f..0ee9e38 100644
--- a/boot/espressif/port/esp_mcuboot.c
+++ b/boot/espressif/port/esp_mcuboot.c
@@ -212,7 +212,11 @@
 
 static bool aligned_flash_write(size_t dest_addr, const void *src, size_t size)
 {
-    bool flash_encryption_enabled = esp_flash_encryption_enabled();
+#ifdef CONFIG_SECURE_FLASH_ENC_ENABLED
+        bool flash_encryption_enabled = esp_flash_encryption_enabled();
+#else
+        bool flash_encryption_enabled = false;
+#endif
 
     if (IS_ALIGNED(dest_addr, 4) && IS_ALIGNED((uintptr_t)src, 4) && IS_ALIGNED(size, 4)) {
         /* A single write operation is enough when all parameters are aligned */
@@ -327,7 +331,11 @@
     static size_t align = 0;
 
     if (align == 0) {
+#ifdef CONFIG_SECURE_FLASH_ENC_ENABLED
         bool flash_encryption_enabled = esp_flash_encryption_enabled();
+#else
+        bool flash_encryption_enabled = false;
+#endif
 
         if (flash_encryption_enabled) {
             align = 32;