commit 204c5b48e22a00865f861a2b4b8c8b18cc41b2d2
author Raef Coles <raef.coles@arm.com> Thu Sep 05 09:18:47 2019 +0100
committer Tamas Ban <tamas.ban@arm.com> Fri Sep 27 14:28:40 2019 +0000
tree 022f2a552fdb27a73623b9988f40a137710ed405
parent 25b857a27e6859e19cb802f43278385543adbc40

Boot: Change the return type of flash_area_align()

Change from uint8_t to uint32_t to prevent an implicit cast. Update
variables and functions which use the return value of the function.

Change-Id: I55bcb1cf2b4b642d1cdf8a1d41c04e601289dea0
Signed-off-by: Raef Coles <raef.coles@arm.com>

bl2/ext/mcuboot/bootutil/src/bootutil_misc.c

diff --git a/bl2/ext/mcuboot/bootutil/src/bootutil_misc.c b/bl2/ext/mcuboot/bootutil/src/bootutil_misc.c
index 9ce0ff1..08f2a3c 100644
--- a/bl2/ext/mcuboot/bootutil/src/bootutil_misc.c
+++ b/bl2/ext/mcuboot/bootutil/src/bootutil_misc.c
@@ -172,7 +172,7 @@
 }
 
 uint32_t
-boot_trailer_sz(uint8_t min_write_sz)
+boot_trailer_sz(uint32_t min_write_sz)
 {
     return /* state for all sectors */
            BOOT_STATUS_MAX_ENTRIES * BOOT_STATUS_STATE_COUNT * min_write_sz +
@@ -204,7 +204,7 @@
 boot_status_off(const struct flash_area *fap)
 {
     uint32_t off_from_end;
-    uint8_t elem_sz;
+    uint32_t elem_sz;
 
     elem_sz = flash_area_align(fap);
 
@@ -410,7 +410,7 @@
                         uint8_t val)
 {
     uint8_t buf[BOOT_MAX_ALIGN];
-    uint8_t align;
+    uint32_t align;
     uint8_t erased_val;
     int rc;
 
@@ -478,7 +478,7 @@
     uint32_t off;
     int rc;
     uint8_t buf[BOOT_MAX_ALIGN];
-    uint8_t align;
+    uint32_t align;
     uint8_t erased_val;
 
     off = boot_swap_size_off(fap);