commit 73bb71b0c688a590cdd80bc75620c356b3d27932
author Rajavardhan Gundi <rajavardhan.gundi@intel.com> Mon Jan 28 15:07:04 2019 +0530
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Mon Jan 28 12:26:08 2019 +0100
tree 9ad7b3ee185b65815592f8390f4ade218db8677d
parent b17af7f85fac9be99f191a8954e49df8c170c39e

CONFIG_FLASH_BASE_ADDRESS is defined only for memory-mapped Flash

Made FLASH_DEVICE_BASE 0 for non-memory-mapped Flash.

Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi@intel.com>

boot/zephyr/flash_map_extended.c

diff --git a/boot/zephyr/flash_map_extended.c b/boot/zephyr/flash_map_extended.c
index db2f94b..5098012 100644
--- a/boot/zephyr/flash_map_extended.c
+++ b/boot/zephyr/flash_map_extended.c
@@ -19,13 +19,14 @@
 
 #if (!defined(CONFIG_XTENSA) && defined(DT_FLASH_DEV_NAME))
 #define FLASH_DEVICE_ID SOC_FLASH_0_ID
+#define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS
 #elif (defined(CONFIG_XTENSA) && defined(DT_SPI_NOR_DRV_NAME))
 #define FLASH_DEVICE_ID SPI_FLASH_0_ID
+#define FLASH_DEVICE_BASE 0
 #else
 #error "FLASH_DEVICE_ID could not be determined"
 #endif
 
-#define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS
 static struct device *flash_dev;
 
 struct device *flash_device_get_binding(char *dev_name)