commit 33a3831b13d88fc2cebb897314d83a3a8f05f02d
author Gustavo Henrique Nihei <gustavo.nihei@espressif.com> Fri Nov 05 15:51:22 2021 -0300
committer David Brown <davidb@davidb.org> Fri Nov 05 15:23:42 2021 -0600
tree 08b68c98243011cb26595e75db7b85e4a4a12727
parent 74a2742c3d5c6c8d12df7ea62b31b88af9a6751d

espressif: Remove write alignment handling

Write operations are always expected to be aligned according to the port
configuration.

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@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 1281d2e..16a58ae 100644
--- a/boot/espressif/port/esp_mcuboot.c
+++ b/boot/espressif/port/esp_mcuboot.c
@@ -185,14 +185,11 @@
 int flash_area_write(const struct flash_area *fa, uint32_t off, const void *src,
                      uint32_t len)
 {
-    uint32_t write_len = len, write_data = 0;
-    void *write_ptr = (void *)src;
     if (fa->fa_device_id != FLASH_DEVICE_INTERNAL_FLASH) {
         return -1;
     }
 
     const uint32_t end_offset = off + len;
-
     if (end_offset > fa->fa_size) {
         MCUBOOT_LOG_ERR("%s: Out of Bounds (0x%x vs 0x%x)", __func__, end_offset, fa->fa_size);
         return -1;
@@ -200,23 +197,11 @@
 
     const uint32_t start_addr = fa->fa_off + off;
     MCUBOOT_LOG_DBG("%s: Addr: 0x%08x Length: %d", __func__, (int)start_addr, (int)len);
-    if (len < 4) {
-        flash_area_read(fa, start_addr, &write_data, sizeof(uint32_t));
-        memcpy(&write_data, src, len);
-        write_ptr = (void *)&write_data;
-        write_len = sizeof(uint32_t);
-    }
 
-    if (bootloader_flash_write(start_addr, write_ptr, write_len, false) != ESP_OK) {
+    if (bootloader_flash_write(start_addr, (void *)src, len, false) != ESP_OK) {
         MCUBOOT_LOG_ERR("%s: Flash write failed", __func__);
         return -1;
     }
-#if VALIDATE_PROGRAM_OP
-    if (memcmp((void *)addr, src, len) != 0) {
-        MCUBOOT_LOG_ERR("%s: Program Failed", __func__);
-        assert(0);
-    }
-#endif
 
     return 0;
 }