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/bl2_main.c

diff --git a/bl2/ext/mcuboot/bl2_main.c b/bl2/ext/mcuboot/bl2_main.c
index 565c547..952e528 100644
--- a/bl2/ext/mcuboot/bl2_main.c
+++ b/bl2/ext/mcuboot/bl2_main.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
- * Copyright (c) 2017, Arm Limited.
+ * Copyright (c) 2017-2018 Arm Limited.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #include "target.h"
 #include "cmsis.h"
 #include "uart_stdout.h"
-
+#include "Driver_Flash.h"
 
 #define BOOT_LOG_LEVEL BOOT_LOG_LEVEL_INFO
 #include "bootutil/bootutil_log.h"
@@ -33,9 +33,8 @@
 __asm("  .global __ARM_use_no_argv\n");
 #endif
 
-/* Keep these variables to be compatible with flash API */
-struct device tmp;
-struct device *boot_flash_device = &tmp;
+/* Flash device name must be specified by target */
+extern ARM_DRIVER_FLASH FLASH_DEV_NAME;
 
 void os_heap_init(void);
 
@@ -85,6 +84,8 @@
 
     os_heap_init();
 
+    /* Initialize Flash driver */
+    FLASH_DEV_NAME.Initialize(NULL);
     rc = boot_go(&rsp);
     if (rc != 0) {
         BOOT_LOG_ERR("Unable to find bootable image");