michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: storage: flash_map: enable only if any flash driver is enable

Browse source 
It was possible to have enable flash module while no flash driver
implementation was enabled. This cause coverity issues and unnecessary
initialization call.

This pat introduce FLASH_HAS_DRIVER_ENABLED Kconfig keyword which is
selected once any flash driver is enabled. flash_map switch its
dependency to this keyword.


Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2018-03-07 14:31:56 +01:00 • committed by Carles Cufí
commit 80a99fa450
4 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/flash/Kconfig
View file

@ -9,6 +9,12 @@
# #
# Flash driver # Flash driver
# #
config FLASH_HAS_DRIVER_ENABLED
bool
default n
help
This option is enabled when any flash driver is enabled.
menuconfig FLASH menuconfig FLASH
bool bool
prompt "Flash hardware support" prompt "Flash hardware support"
@ -26,6 +32,7 @@ config FLASH_PAGE_LAYOUT
config SPI_FLASH_W25QXXDV config SPI_FLASH_W25QXXDV
bool bool
prompt "SPI NOR Flash Winbond W25QXXDV" prompt "SPI NOR Flash Winbond W25QXXDV"
select FLASH_HAS_DRIVER_ENABLED
depends on SPI && FLASH depends on SPI && FLASH
config SPI_FLASH_W25QXXDV_SPI_NAME config SPI_FLASH_W25QXXDV_SPI_NAME
@ -84,6 +91,7 @@ config SOC_FLASH_QMSI
bool bool
prompt "QMSI flash driver" prompt "QMSI flash driver"
depends on QMSI && FLASH depends on QMSI && FLASH
select FLASH_HAS_DRIVER_ENABLED
default n default n
help help
Enable QMSI Quark flash driver. Enable QMSI Quark flash driver.
@ -128,6 +136,7 @@ config SOC_FLASH_NRF5
depends on FLASH && SOC_FAMILY_NRF5 depends on FLASH && SOC_FAMILY_NRF5
default n default n
select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED
help help
Enables Nordic Semiconductor nRF5X flash driver. Enables Nordic Semiconductor nRF5X flash driver.
@ -142,6 +151,7 @@ config SOC_FLASH_MCUX
bool "MCUX flash shim driver" bool "MCUX flash shim driver"
depends on FLASH && HAS_MCUX depends on FLASH && HAS_MCUX
select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED
default n default n
help help
Enables the MCUX flash shim driver. Enables the MCUX flash shim driver.
@ -154,6 +164,7 @@ config SOC_FLASH_NIOS2_QSPI
bool "Nios-II QSPI flash driver" bool "Nios-II QSPI flash driver"
depends on FLASH && HAS_ALTERA_HAL depends on FLASH && HAS_ALTERA_HAL
default n default n
select FLASH_HAS_DRIVER_ENABLED
help help
Enables the Nios-II QSPI flash driver. Enables the Nios-II QSPI flash driver.

1
drivers/flash/Kconfig.sam0
View file

@ -10,6 +10,7 @@ menuconfig SOC_FLASH_SAM0
prompt "Atmel SAM0 flash driver" prompt "Atmel SAM0 flash driver"
default n default n
select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED
help help
Enable the Atmel SAM0 series internal flash driver. Enable the Atmel SAM0 series internal flash driver.

1
drivers/flash/Kconfig.stm32
View file

@ -12,6 +12,7 @@ menuconfig SOC_FLASH_STM32
bool bool
prompt "STM32 flash driver" prompt "STM32 flash driver"
depends on (SOC_SERIES_STM32F0X || SOC_SERIES_STM32F3X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32L4X) depends on (SOC_SERIES_STM32F0X || SOC_SERIES_STM32F3X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32L4X)
select FLASH_HAS_DRIVER_ENABLED
default y default y
select FLASH_PAGE_LAYOUT if SOC_SERIES_STM32F0X select FLASH_PAGE_LAYOUT if SOC_SERIES_STM32F0X
select FLASH_PAGE_LAYOUT if SOC_SERIES_STM32F4X select FLASH_PAGE_LAYOUT if SOC_SERIES_STM32F4X

2
subsys/storage/flash_map/Kconfig
View file

@ -13,7 +13,7 @@ menuconfig FLASH_MAP
bool bool
prompt "Flash map abstraction module" prompt "Flash map abstraction module"
default n default n
depends on FLASH depends on FLASH_HAS_DRIVER_ENABLED
help help
Enable support of flash map abstraction. Enable support of flash map abstraction.