diff --git a/arch/arm/soc/st_stm32/stm32f0/dts.fixup b/arch/arm/soc/st_stm32/stm32f0/dts.fixup new file mode 100644 index 00000000000..b6ad87f1607 --- /dev/null +++ b/arch/arm/soc/st_stm32/stm32f0/dts.fixup @@ -0,0 +1,6 @@ +/* SoC level DTS fixup file */ + +#define FLASH_DEV_BASE_ADDRESS ST_STM32F0_FLASH_CONTROLLER_40022000_BASE_ADDRESS_0 +#define FLASH_DEV_NAME ST_STM32F0_FLASH_CONTROLLER_40022000_LABEL + +/* End of SoC Level DTS fixup file */ diff --git a/arch/arm/soc/st_stm32/stm32f3/dts.fixup b/arch/arm/soc/st_stm32/stm32f3/dts.fixup new file mode 100644 index 00000000000..3f387b30e8b --- /dev/null +++ b/arch/arm/soc/st_stm32/stm32f3/dts.fixup @@ -0,0 +1,6 @@ +/* SoC level DTS fixup file */ + +#define FLASH_DEV_BASE_ADDRESS ST_STM32F3_FLASH_CONTROLLER_40022000_BASE_ADDRESS_0 +#define FLASH_DEV_NAME ST_STM32F3_FLASH_CONTROLLER_40022000_LABEL + +/* End of SoC Level DTS fixup file */ diff --git a/arch/arm/soc/st_stm32/stm32f4/dts.fixup b/arch/arm/soc/st_stm32/stm32f4/dts.fixup new file mode 100644 index 00000000000..5cddb1e584c --- /dev/null +++ b/arch/arm/soc/st_stm32/stm32f4/dts.fixup @@ -0,0 +1,6 @@ +/* SoC level DTS fixup file */ + +#define FLASH_DEV_BASE_ADDRESS ST_STM32F4_FLASH_CONTROLLER_40023C00_BASE_ADDRESS_0 +#define FLASH_DEV_NAME ST_STM32F4_FLASH_CONTROLLER_40023C00_LABEL + +/* End of SoC Level DTS fixup file */ diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.h b/arch/arm/soc/st_stm32/stm32f4/soc.h index 915345a465c..2638c204253 100644 --- a/arch/arm/soc/st_stm32/stm32f4/soc.h +++ b/arch/arm/soc/st_stm32/stm32f4/soc.h @@ -58,7 +58,7 @@ /* For IMG_MANAGER */ #if defined(CONFIG_SOC_FLASH_STM32) -#define FLASH_DRIVER_NAME CONFIG_SOC_FLASH_STM32_DEV_NAME +#define FLASH_DRIVER_NAME FLASH_DEV_NAME #endif #endif /* !_ASMLANGUAGE */ diff --git a/arch/arm/soc/st_stm32/stm32l4/dts.fixup b/arch/arm/soc/st_stm32/stm32l4/dts.fixup new file mode 100644 index 00000000000..bcb7c464b9e --- /dev/null +++ b/arch/arm/soc/st_stm32/stm32l4/dts.fixup @@ -0,0 +1,6 @@ +/* SoC level DTS fixup file */ + +#define FLASH_DEV_BASE_ADDRESS ST_STM32L4_FLASH_CONTROLLER_40022000_BASE_ADDRESS_0 +#define FLASH_DEV_NAME ST_STM32L4_FLASH_CONTROLLER_40022000_LABEL + +/* End of SoC Level DTS fixup file */ diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.h b/arch/arm/soc/st_stm32/stm32l4/soc.h index 720e2a108c9..8df01e2682c 100644 --- a/arch/arm/soc/st_stm32/stm32l4/soc.h +++ b/arch/arm/soc/st_stm32/stm32l4/soc.h @@ -57,7 +57,7 @@ /* For IMG_MANAGER */ #if defined(CONFIG_SOC_FLASH_STM32) -#define FLASH_DRIVER_NAME CONFIG_SOC_FLASH_STM32_DEV_NAME +#define FLASH_DRIVER_NAME FLASH_DEV_NAME #endif #endif /* !_ASMLANGUAGE */ diff --git a/drivers/flash/Kconfig.stm32 b/drivers/flash/Kconfig.stm32 index 20a5627adf8..f009391b1ab 100644 --- a/drivers/flash/Kconfig.stm32 +++ b/drivers/flash/Kconfig.stm32 @@ -22,11 +22,4 @@ menuconfig SOC_FLASH_STM32 help Enable STM32F0x, STM32F3x, STM32F4x OR STM32L4x series flash driver. -config SOC_FLASH_STM32_DEV_NAME - string "STM32 flash device name" - depends on SOC_FLASH_STM32 - default "FLASH_STM32" - help - Specify the device name for the flash driver. - endif diff --git a/drivers/flash/flash_stm32.c b/drivers/flash/flash_stm32.c index 5af3330c701..d18015c07e6 100644 --- a/drivers/flash/flash_stm32.c +++ b/drivers/flash/flash_stm32.c @@ -204,13 +204,13 @@ static int flash_stm32_write_protection(struct device *dev, bool enable) static struct flash_stm32_priv flash_data = { #if defined(CONFIG_SOC_SERIES_STM32F0X) - .regs = (struct stm32f0x_flash *) FLASH_R_BASE, + .regs = (struct stm32f0x_flash *) FLASH_DEV_BASE_ADDRESS, .pclken = { .bus = STM32_CLOCK_BUS_AHB1, .enr = LL_AHB1_GRP1_PERIPH_FLASH }, #elif defined(CONFIG_SOC_SERIES_STM32F4X) - .regs = (struct stm32f4x_flash *) FLASH_R_BASE, + .regs = (struct stm32f4x_flash *) FLASH_DEV_BASE_ADDRESS, #elif defined(CONFIG_SOC_SERIES_STM32L4X) - .regs = (struct stm32l4x_flash *) FLASH_R_BASE, + .regs = (struct stm32l4x_flash *) FLASH_DEV_BASE_ADDRESS, .pclken = { .bus = STM32_CLOCK_BUS_AHB1, .enr = LL_AHB1_GRP1_PERIPH_FLASH }, #endif @@ -260,6 +260,6 @@ static int stm32_flash_init(struct device *dev) return flash_stm32_write_protection(dev, false); } -DEVICE_AND_API_INIT(stm32_flash, CONFIG_SOC_FLASH_STM32_DEV_NAME, +DEVICE_AND_API_INIT(stm32_flash, FLASH_DEV_NAME, stm32_flash_init, &flash_data, NULL, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &flash_stm32_api); diff --git a/drivers/flash/flash_stm32f3x.c b/drivers/flash/flash_stm32f3x.c index b025ffb93f4..8e0bf1ac213 100644 --- a/drivers/flash/flash_stm32f3x.c +++ b/drivers/flash/flash_stm32f3x.c @@ -133,7 +133,7 @@ static const struct flash_driver_api flash_stm32_api = { }; static const struct flash_stm32_dev_config flash_device_config = { - .base = (u32_t *)FLASH_R_BASE, + .base = (u32_t *)FLASH_DEV_BASE_ADDRESS, .pclken = { .bus = STM32_CLOCK_BUS_APB1, .enr = LL_AHB1_GRP1_PERIPH_FLASH}, }; @@ -142,7 +142,7 @@ static struct flash_stm32_dev_data flash_device_data = { }; -DEVICE_AND_API_INIT(flash_stm32, CONFIG_SOC_FLASH_STM32_DEV_NAME, +DEVICE_AND_API_INIT(flash_stm32, FLASH_DEV_NAME, flash_stm32_init, &flash_device_data, &flash_device_config, diff --git a/samples/mpu/mpu_test/src/main.c b/samples/mpu/mpu_test/src/main.c index 4308874a84e..c584e1da56b 100644 --- a/samples/mpu/mpu_test/src/main.c +++ b/samples/mpu/mpu_test/src/main.c @@ -72,7 +72,7 @@ static int shell_cmd_write_stm32(int argc, char *argv[]) ARG_UNUSED(argv); struct device *flash_dev; - flash_dev = device_get_binding(CONFIG_SOC_FLASH_STM32_DEV_NAME); + flash_dev = device_get_binding(FLASH_DEV_NAME); /* 16K reserved to the application */ u32_t offset = FLASH_MEM + 0x4000;