Fixed size for memcmp/copy used in fork_bootloader

Author: danielinux

hal/stm32h5.c

@@ -376,7 +376,9 @@ void RAMFUNCTION hal_flash_dualbank_swap(void)
     stm32h5_reboot();
 }
 
-static uint8_t bootloader_copy_mem[BOOTLOADER_SIZE];
+
+#define BOOTLOADER_COPY_MEM_SIZE 0x1000
+static uint8_t bootloader_copy_mem[BOOTLOADER_COPY_MEM_SIZE];
 
 static void fork_bootloader(void)
 {
@@ -395,13 +397,17 @@ static void fork_bootloader(void)
     if (memcmp((void *)data, (const char*)dst, BOOTLOADER_SIZE) == 0)
         return;
 
-    /* Read the wolfBoot image in RAM */
-    memcpy(bootloader_copy_mem, (void*)data, BOOTLOADER_SIZE);
-
-    /* Mass-erase */
     hal_flash_unlock();
+    /* Mass-erase second block */
     hal_flash_erase(dst, BOOTLOADER_SIZE);
-    hal_flash_write(dst, bootloader_copy_mem, BOOTLOADER_SIZE);
+    /* Read the wolfBoot image in RAM */
+    for (i = 0; i < BOOTLOADER_SIZE;
+            i += BOOTLOADER_COPY_MEM_SIZE) {
+        memcpy(bootloader_copy_mem, (void*)(data + i),
+                BOOTLOADER_COPY_MEM_SIZE);
+        hal_flash_write(dst + i, bootloader_copy_mem,
+                BOOTLOADER_COPY_MEM_SIZE);
+    }
     hal_flash_lock();
 }
 #endif

hal/stm32h5.h

@@ -326,7 +326,7 @@
 #define FLASHMEM_ADDRESS_SPACE    (0x08000000)
 #define FLASH_PAGE_SIZE           (0x2000)      /* 8KB */
 #define FLASH_BANK2_BASE          (0x08100000) /*!< Base address of Flash Bank2     */
-#define BOOTLOADER_SIZE           (0x8000)
+#define BOOTLOADER_SIZE           (WOLFBOOT_PARTITION_BOOT_ADDRESS - FLASHMEM_ADDRESS_SPACE)
 #define FLASH_TOP                 (0x081FFFFF) /*!< FLASH end address (sector 127)  */
 
 #define FLASH_KEY1                            (0x45670123U)