From c734c2972f6400d1caccfb2d1d542eed1b77b41c Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Tue, 6 Feb 2018 14:28:12 +0100 Subject: [PATCH] flash: remove obsolete FLASH_DRIVER_NAME Replace seldom occurrences of FLASH_DRIVER_NAME by equivalent and commonly used FLASH_DEV_NAME. Fixes #5919. Signed-off-by: Erwan Gouriou --- arch/arm/soc/nordic_nrf5/nrf51/soc.h | 5 ----- arch/arm/soc/nordic_nrf5/nrf52/soc.h | 5 ----- arch/arm/soc/nxp_kinetis/k6x/soc.h | 5 ----- arch/arm/soc/nxp_kinetis/kl2x/soc.h | 4 ---- arch/arm/soc/nxp_kinetis/kwx/soc.h | 4 ---- arch/arm/soc/st_stm32/stm32f4/soc.h | 5 ----- arch/arm/soc/st_stm32/stm32l4/soc.h | 5 ----- samples/drivers/flash_shell/src/main.c | 10 +++++----- subsys/dfu/boot/mcuboot.c | 2 +- subsys/storage/flash_map/flash_map.c | 2 +- 10 files changed, 7 insertions(+), 40 deletions(-) diff --git a/arch/arm/soc/nordic_nrf5/nrf51/soc.h b/arch/arm/soc/nordic_nrf5/nrf51/soc.h index d30070c15af..6d0673e1d26 100644 --- a/arch/arm/soc/nordic_nrf5/nrf51/soc.h +++ b/arch/arm/soc/nordic_nrf5/nrf51/soc.h @@ -28,9 +28,4 @@ #define FLASH_PAGE_ERASE_MAX_TIME_US 22300UL #define FLASH_PAGE_MAX_CNT 256UL -/* For IMG_MANAGER */ -#if defined(CONFIG_SOC_FLASH_NRF5) -#define FLASH_DRIVER_NAME FLASH_DEV_NAME -#endif - #endif /* _NORDICSEMI_NRF51_SOC_H_ */ diff --git a/arch/arm/soc/nordic_nrf5/nrf52/soc.h b/arch/arm/soc/nordic_nrf5/nrf52/soc.h index e6602b1fe84..e32bc02e57c 100644 --- a/arch/arm/soc/nordic_nrf5/nrf52/soc.h +++ b/arch/arm/soc/nordic_nrf5/nrf52/soc.h @@ -24,9 +24,4 @@ #define FLASH_PAGE_ERASE_MAX_TIME_US 89700UL #define FLASH_PAGE_MAX_CNT 256UL -/* For IMG_MANAGER */ -#if defined(CONFIG_SOC_FLASH_NRF5) -#define FLASH_DRIVER_NAME FLASH_DEV_NAME -#endif - #endif /* _NORDICSEMI_NRF52_SOC_H_ */ diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.h b/arch/arm/soc/nxp_kinetis/k6x/soc.h index 57617c63e08..c4370676f82 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/soc.h +++ b/arch/arm/soc/nxp_kinetis/k6x/soc.h @@ -52,11 +52,6 @@ extern "C" { #include #include -/* For IMG_MANAGER */ -#if defined(CONFIG_SOC_FLASH_MCUX) -#define FLASH_DRIVER_NAME FLASH_DEV_NAME -#endif - #endif /* !_ASMLANGUAGE */ #ifdef __cplusplus diff --git a/arch/arm/soc/nxp_kinetis/kl2x/soc.h b/arch/arm/soc/nxp_kinetis/kl2x/soc.h index 20aceccc73f..3995345306b 100644 --- a/arch/arm/soc/nxp_kinetis/kl2x/soc.h +++ b/arch/arm/soc/nxp_kinetis/kl2x/soc.h @@ -27,10 +27,6 @@ extern "C" { #include #include -#if defined(CONFIG_SOC_FLASH_MCUX) -#define FLASH_DRIVER_NAME FLASH_DEV_NAME -#endif - #endif /* !_ASMLANGUAGE */ #ifdef __cplusplus diff --git a/arch/arm/soc/nxp_kinetis/kwx/soc.h b/arch/arm/soc/nxp_kinetis/kwx/soc.h index 7263a4e4b22..c6d2e9c0d52 100644 --- a/arch/arm/soc/nxp_kinetis/kwx/soc.h +++ b/arch/arm/soc/nxp_kinetis/kwx/soc.h @@ -50,10 +50,6 @@ extern "C" { #include #include -#if defined(CONFIG_SOC_FLASH_MCUX) -#define FLASH_DRIVER_NAME FLASH_DEV_NAME -#endif - #endif /* !_ASMLANGUAGE */ #ifdef __cplusplus diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.h b/arch/arm/soc/st_stm32/stm32f4/soc.h index 2638c204253..2df5cebb50e 100644 --- a/arch/arm/soc/st_stm32/stm32f4/soc.h +++ b/arch/arm/soc/st_stm32/stm32f4/soc.h @@ -56,11 +56,6 @@ #include #endif -/* For IMG_MANAGER */ -#if defined(CONFIG_SOC_FLASH_STM32) -#define FLASH_DRIVER_NAME FLASH_DEV_NAME -#endif - #endif /* !_ASMLANGUAGE */ #endif /* _STM32F4_SOC_H_ */ diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.h b/arch/arm/soc/st_stm32/stm32l4/soc.h index 8df01e2682c..71e127af24b 100644 --- a/arch/arm/soc/st_stm32/stm32l4/soc.h +++ b/arch/arm/soc/st_stm32/stm32l4/soc.h @@ -55,11 +55,6 @@ #include #endif -/* For IMG_MANAGER */ -#if defined(CONFIG_SOC_FLASH_STM32) -#define FLASH_DRIVER_NAME FLASH_DEV_NAME -#endif - #endif /* !_ASMLANGUAGE */ #endif /* _STM32L4X_SOC_H_ */ diff --git a/samples/drivers/flash_shell/src/main.c b/samples/drivers/flash_shell/src/main.c index f99e7136bd7..93ba78654f1 100644 --- a/samples/drivers/flash_shell/src/main.c +++ b/samples/drivers/flash_shell/src/main.c @@ -17,11 +17,11 @@ #define THIS_MODULE_NAME "flash" /* - * When soc.h provides a FLASH_DRIVER_NAME, we use it here. Otherwise, + * When FLASH_DEV_NAME is available, we use it here. Otherwise, * the device can be set at runtime with the set_device command. */ -#ifndef FLASH_DRIVER_NAME -#define FLASH_DRIVER_NAME "" +#ifndef FLASH_DEV_NAME +#define FLASH_DEV_NAME "" #endif /* Command usage info. */ @@ -578,9 +578,9 @@ static struct shell_cmd commands[] = { void main(void) { - flash_device = device_get_binding(FLASH_DRIVER_NAME); + flash_device = device_get_binding(FLASH_DEV_NAME); if (flash_device) { - printk("Found flash device %s.\n", FLASH_DRIVER_NAME); + printk("Found flash device %s.\n", FLASH_DEV_NAME); printk("Flash I/O commands can be run.\n"); } else { printk("**No flash device found!**\n"); diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c index 93a7190d66d..8cb39861ef1 100644 --- a/subsys/dfu/boot/mcuboot.c +++ b/subsys/dfu/boot/mcuboot.c @@ -318,7 +318,7 @@ int boot_erase_img_bank(u32_t bank_offset) static int boot_init(struct device *dev) { ARG_UNUSED(dev); - flash_dev = device_get_binding(FLASH_DRIVER_NAME); + flash_dev = device_get_binding(FLASH_DEV_NAME); if (!flash_dev) { return -ENODEV; } diff --git a/subsys/storage/flash_map/flash_map.c b/subsys/storage/flash_map/flash_map.c index 60a55ca3f26..a2a1d04da23 100644 --- a/subsys/storage/flash_map/flash_map.c +++ b/subsys/storage/flash_map/flash_map.c @@ -33,7 +33,7 @@ struct driver_map_entry { static const struct driver_map_entry flash_drivers_map[] = { #ifdef FLASH_DRIVER_NAME /* SoC embedded flash driver */ - {SOC_FLASH_0_ID, FLASH_DRIVER_NAME}, + {SOC_FLASH_0_ID, FLASH_DEV_NAME}, #endif #ifdef CONFIG_SPI_FLASH_W25QXXDV {SPI_FLASH_0_ID, CONFIG_SPI_FLASH_W25QXXDV_DRV_NAME},