drivers: flash: fix Kconfig dependencies

Use top level conditional and remove 'depends on FLASH'

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-10-08 18:15:21 -04:00
commit 6b8bbc7d07
4 changed files with 10 additions and 7 deletions

View file

@ -25,15 +25,16 @@ menuconfig FLASH
help
Enable support for the flash hardware.
if FLASH
config FLASH_PAGE_LAYOUT
bool "API for retrieving the layout of pages"
depends on FLASH && FLASH_HAS_PAGE_LAYOUT
depends on FLASH_HAS_PAGE_LAYOUT
help
Enables API for retrieving the layout of flash memory pages.
config SOC_FLASH_NRF
bool "Nordic Semiconductor nRF flash driver"
depends on FLASH && SOC_FAMILY_NRF
depends on SOC_FAMILY_NRF
select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED
help
@ -48,7 +49,7 @@ config SOC_FLASH_NRF_RADIO_SYNC
config SOC_FLASH_MCUX
bool "MCUX flash shim driver"
depends on FLASH && HAS_MCUX
depends on HAS_MCUX
select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED
help
@ -60,7 +61,7 @@ config SOC_FLASH_MCUX
config SOC_FLASH_NIOS2_QSPI
bool "Nios-II QSPI flash driver"
depends on FLASH && HAS_ALTERA_HAL
depends on HAS_ALTERA_HAL
select FLASH_HAS_DRIVER_ENABLED
help
Enables the Nios-II QSPI flash driver.
@ -79,3 +80,5 @@ source "drivers/flash/Kconfig.stm32"
source "drivers/flash/Kconfig.sam0"
source "drivers/flash/Kconfig.w25qxxdv"
endif

View file

@ -3,7 +3,7 @@
# Copyright (c) 2018 Google LLC.
# SPDX-License-Identifier: Apache-2.0
if FLASH && SOC_FAMILY_SAM0
if SOC_FAMILY_SAM0
menuconfig SOC_FLASH_SAM0
bool "Atmel SAM0 flash driver"

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
if FLASH && SOC_FAMILY_STM32
if SOC_FAMILY_STM32
menuconfig SOC_FLASH_STM32
bool "STM32 flash driver"

View file

@ -8,7 +8,7 @@
menuconfig SPI_FLASH_W25QXXDV
bool "SPI NOR Flash Winbond W25QXXDV"
select FLASH_HAS_DRIVER_ENABLED
depends on SPI && FLASH
depends on SPI
if SPI_FLASH_W25QXXDV