zephyr: cleanup flash driver name
The flash driver name was changed upstream during the v1.11
development cycle. Remove a shim which kept the old name around in the
Zephyr port now that v1.11 is out.
Signed-off-by: Marti Bolivar <marti@opensourcefoundries.com>
diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h
index a2c5cf4..00251df 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -31,19 +31,9 @@
#endif /* !defined(MCUBOOT_TARGET_CONFIG) */
/*
- * Upstream Zephyr changed the name from FLASH_DRIVER_NAME to
- * FLASH_DEV_NAME. For now, let's just convert the Zephyr name to the
- * one expected by MCUboot. This can be cleaned up after the upstream
- * Zephyr tree has been released and settled down.
- */
-#if !defined(FLASH_DRIVER_NAME) && defined(FLASH_DEV_NAME)
-#define FLASH_DRIVER_NAME FLASH_DEV_NAME
-#endif
-
-/*
* Sanity check the target support.
*/
-#if !defined(FLASH_DRIVER_NAME) || \
+#if !defined(FLASH_DEV_NAME) || \
!defined(FLASH_ALIGN) || \
!defined(FLASH_AREA_IMAGE_0_OFFSET) || \
!defined(FLASH_AREA_IMAGE_0_SIZE) || \
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index 1f80dac..6dda3bd 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -99,9 +99,9 @@
os_heap_init();
- boot_flash_device = device_get_binding(FLASH_DRIVER_NAME);
+ boot_flash_device = device_get_binding(FLASH_DEV_NAME);
if (!boot_flash_device) {
- BOOT_LOG_ERR("Flash device not found");
+ BOOT_LOG_ERR("Flash device %s not found", FLASH_DEV_NAME);
while (1)
;
}
diff --git a/boot/zephyr/targets/arduino_101.h b/boot/zephyr/targets/arduino_101.h
index 2a97268..19095b3 100644
--- a/boot/zephyr/targets/arduino_101.h
+++ b/boot/zephyr/targets/arduino_101.h
@@ -27,7 +27,7 @@
* In this configuration MCUboot will live at 0x40010000
*/
-#define FLASH_DRIVER_NAME CONFIG_SOC_FLASH_QMSI_DEV_NAME
+#define FLASH_DEV_NAME CONFIG_SOC_FLASH_QMSI_DEV_NAME
#define FLASH_ALIGN 4
#define FLASH_AREA_IMAGE_0_OFFSET 0x40020000
#define FLASH_AREA_IMAGE_0_SIZE 0x10000