commit 14763b1cd2fcf6cc71f0c8cd2136f0e3afd7c9c5
author Almir Okato <almir.okato@espressif.com> Thu Nov 25 00:45:26 2021 -0300
committer Gustavo Henrique Nihei <38959758+gustavonihei@users.noreply.github.com> Tue Dec 28 10:51:54 2021 -0300
tree 153df18e942eaecc6355728dee1e48eb7b40dccf
parent 818964d513b0454704cc620c2c42c800ee8daba1

espressif: ESP32, ESP32S2 and ESP32C3 native flash encryption

Native flash encryption was added as option for Espressif chips and
added to the initialization process before MCUboot workflow.

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 4dd03b9..5cda2ae 100644
--- a/boot/espressif/port/esp_mcuboot.c
+++ b/boot/espressif/port/esp_mcuboot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -11,8 +11,10 @@
 #include <bootutil/bootutil.h>
 #include <bootutil/bootutil_log.h>
 
+#include "sdkconfig.h"
 #include "esp_err.h"
 #include "bootloader_flash_priv.h"
+#include "esp_flash_encrypt.h"
 
 #include "flash_map_backend/flash_map_backend.h"
 #include "sysflash/sysflash.h"
@@ -45,7 +47,7 @@
 
 _Static_assert(IS_ALIGNED(FLASH_BUFFER_SIZE, 4), "Buffer size for SPI Flash operations must be 4-byte aligned.");
 
-#define BOOTLOADER_START_ADDRESS 0x1000
+#define BOOTLOADER_START_ADDRESS CONFIG_BOOTLOADER_OFFSET_IN_FLASH
 #define BOOTLOADER_SIZE CONFIG_ESP_BOOTLOADER_SIZE
 #define APPLICATION_PRIMARY_START_ADDRESS CONFIG_ESP_APPLICATION_PRIMARY_START_ADDRESS
 #define APPLICATION_SECONDARY_START_ADDRESS CONFIG_ESP_APPLICATION_SECONDARY_START_ADDRESS
@@ -196,10 +198,12 @@
         return -1;
     }
 
+    bool flash_encryption_enabled = esp_flash_encryption_enabled();
+
     const uint32_t start_addr = fa->fa_off + off;
     BOOT_LOG_DBG("%s: Addr: 0x%08x Length: %d", __func__, (int)start_addr, (int)len);
 
-    if (bootloader_flash_write(start_addr, (void *)src, len, false) != ESP_OK) {
+    if (bootloader_flash_write(start_addr, (void *)src, len, flash_encryption_enabled) != ESP_OK) {
         BOOT_LOG_ERR("%s: Flash write failed", __func__);
         return -1;
     }
@@ -241,7 +245,18 @@
 
 uint32_t flash_area_align(const struct flash_area *area)
 {
-    return 4;
+    static size_t align = 0;
+
+    if (align == 0) {
+        bool flash_encryption_enabled = esp_flash_encryption_enabled();
+
+        if (flash_encryption_enabled) {
+            align = 32;
+        } else {
+            align = 4;
+        }
+    }
+    return align;
 }
 
 uint8_t flash_area_erased_val(const struct flash_area *area)