commit c3828850de8ae26af973f9c699c008c1e470f2f2
author Tamas Ban <tamas.ban@arm.com> Thu Feb 01 12:24:16 2018 +0000
committer Marc Moreno Berengue <marc.morenoberengue@arm.com> Thu May 17 10:22:37 2018 +0100
tree 8e502eaf5c130b61a8c55f5ee86fdd6953f3d417
parent d3d2da40ff2b08e33cb190a2928b7717d24127d0

Boot: introduce CMSIS flash interface and driver

Replace legacy flash interface and driver with
CMSIS compliant version:
 -- remove legacy flash interface
 -- add CMSIS compliant version

Change-Id: I8798d191d8f806500621f76c3c3f62d75aceb7cb
Signed-off-by: Tamas Ban <tamas.ban@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 494879c..a22e6c1 100644
--- a/bl2/ext/mcuboot/bootutil/src/bootutil_misc.c
+++ b/bl2/ext/mcuboot/bootutil/src/bootutil_misc.c
@@ -22,7 +22,6 @@
 #include <inttypes.h>
 #include <stddef.h>
 
-#include "hal/hal_flash.h"
 #include "flash_map/flash_map.h"
 #include "bootutil/image.h"
 #include "bootutil/bootutil.h"
@@ -354,7 +353,7 @@
         return BOOT_EBADARGS;
     }
 
-    align = hal_flash_align(fap->fa_device_id);
+    align = flash_area_align(fap);
     assert(align <= BOOT_MAX_ALIGN);
     memset(buf, 0xFF, BOOT_MAX_ALIGN);
     buf[0] = BOOT_FLAG_SET;
@@ -388,7 +387,7 @@
     uint8_t align;
 
     off = boot_swap_size_off(fap);
-    align = hal_flash_align(fap->fa_device_id);
+    align = flash_area_align(fap);
     assert(align <= BOOT_MAX_ALIGN);
     if (align < sizeof(swap_size)) {
         align = sizeof(swap_size);