drivers/flash: Cleaning up Kconfig

Splitting to dedicated Kconfig for w25qxxdv and qmsi.

Signed-off-by: Tomasz Bursztyka <[email protected]>

Author: Tomasz Bursztyka

drivers/flash/Kconfig

@@ -36,132 +36,6 @@ config FLASH_PAGE_LAYOUT
 	help
 	  Enables API for retrieving the layout of flash memory pages.
 
-config SPI_FLASH_W25QXXDV
-	bool
-	prompt "SPI NOR Flash Winbond W25QXXDV"
-	select FLASH_HAS_DRIVER_ENABLED
-	depends on SPI && FLASH
-
-config SPI_FLASH_W25QXXDV_SPI_NAME
-	string
-	prompt "SPI controller device name"
-	depends on SPI_FLASH_W25QXXDV
-	default ""
-
-config SPI_FLASH_W25QXXDV_DRV_NAME
-	string
-	prompt "SPI flash device name"
-	depends on SPI_FLASH_W25QXXDV
-	default "W25QXXDV"
-
-config SPI_FLASH_W25QXXDV_INIT_PRIORITY
-	int
-	depends on SPI_FLASH_W25QXXDV
-	default 80
-	help
-	  Device driver initialization priority.
-	  Device is connected to SPI bus, it has to
-	  be initialized after SPI driver.
-
-config SPI_FLASH_W25QXXDV_SPI_FREQ_0
-	int "SPI system frequency"
-	depends on SPI_FLASH_W25QXXDV
-	default 8000000
-	help
-	  This option sets the SPI controller's frequency. Beware this value
-	  depends on the SPI controller being used and also on the system
-	  clock.
-
-config	SPI_FLASH_W25QXXDV_SPI_SLAVE
-	int "SPI slave linked to SPI flash"
-	depends on SPI_FLASH_W25QXXDV
-	help
-	  This option sets the SPI slave number the SPI controller has to switch
-	  to when dealing with WinBond SPI flash chip.
-
-config SPI_FLASH_W25QXXDV_GPIO_SPI_CS
-	bool "Manage SPI CS through a GPIO pin"
-	default n
-	depends on SPI_FLASH_W25QXXDV
-	help
-	This option is useful if one needs to manage SPI CS through a GPIO
-	pin to by-pass the SPI controller's CS logic.
-
-config SPI_FLASH_W25QXXDV_GPIO_SPI_CS_DRV_NAME
-	string "GPIO driver's name to use to drive SPI CS through"
-	default ""
-	depends on SPI_FLASH_W25QXXDV_GPIO_SPI_CS
-	help
-	This option is mandatory to set which GPIO controller to use in order
-	to actually emulate the SPI CS.
-
-config SPI_FLASH_W25QXXDV_GPIO_SPI_CS_PIN
-	int "GPIO PIN to use to drive SPI CS through"
-	default 0
-	depends on SPI_FLASH_W25QXXDV_GPIO_SPI_CS
-	help
-	This option is mandatory to set which GPIO pin to use in order
-	to actually emulate the SPI CS.
-
-config SPI_FLASH_W25QXXDV_FLASH_SIZE
-	int "Flash size in bytes"
-	depends on SPI_FLASH_W25QXXDV
-	default 2097152
-	help
-	  This is the flash capacity in bytes.
-
-config SPI_FLASH_W25QXXDV_MAX_DATA_LEN
-	int
-	range 1 256
-	depends on SPI_FLASH_W25QXXDV
-	default 256
-	help
-	  Maximum transmit or receive data length in one user data frame.
-
-config SOC_FLASH_QMSI
-	bool
-	prompt "QMSI flash driver"
-	depends on QMSI && FLASH
-	select FLASH_HAS_DRIVER_ENABLED
-	default n
-	help
-	  Enable QMSI Quark flash driver.
-
-config SOC_FLASH_QMSI_DEV_NAME
-	string "QMSI flash device name"
-	depends on SOC_FLASH_QMSI
-	default "QUARK_FLASH"
-	help
-	  Specify the device name for the flash driver.
-
-config SOC_FLASH_QMSI_CLK_COUNT_US
-	int "System clk count per microsecond"
-	depends on SOC_FLASH_QMSI
-	default 32
-	help
-	  Specify the system clk cycles per microsecond.
-
-config SOC_FLASH_QMSI_WAIT_STATES
-	int "The number of flash wait states"
-	depends on SOC_FLASH_QMSI
-	default 1
-	help
-	  Specify the number of wait states for Quark flash.
-
-config SOC_FLASH_QMSI_SYS_SIZE
-	hex "SOC system flash size"
-	depends on SOC_FLASH_QMSI
-	help
-	  Specify system flash size on the Quark SOC.
-
-config SOC_FLASH_QMSI_API_REENTRANCY
-	bool
-	prompt "flash driver API reentrancy for QMSI shim driver"
-	depends on SOC_FLASH_QMSI
-	default n
-	help
-	 Enable support for QMSI flash driver API reentrancy.
-
 config SOC_FLASH_NRF
 	bool "Nordic Semiconductor nRF flash driver"
 	depends on FLASH && SOC_FAMILY_NRF
@@ -206,6 +80,10 @@ config SOC_FLASH_NIOS2_QSPI_DEV_NAME
 	help
 	  Specify the device name for the QSPI flash driver.
 
+source "drivers/flash/Kconfig.qmsi"
+
 source "drivers/flash/Kconfig.stm32"
 
 source "drivers/flash/Kconfig.sam0"
+
+source "drivers/flash/Kconfig.w25qxxdv"

drivers/flash/Kconfig.qmsi

@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+menuconfig SOC_FLASH_QMSI
+	bool
+	prompt "QMSI flash driver"
+	depends on QMSI && FLASH
+	select FLASH_HAS_DRIVER_ENABLED
+	default n
+	help
+	  Enable QMSI Quark flash driver.
+
+if SOC_FLASH_QMSI
+
+config SOC_FLASH_QMSI_DEV_NAME
+	string "QMSI flash device name"
+	default "QUARK_FLASH"
+	help
+	  Specify the device name for the flash driver.
+
+config SOC_FLASH_QMSI_CLK_COUNT_US
+	int "System clk count per microsecond"
+	default 32
+	help
+	  Specify the system clk cycles per microsecond.
+
+config SOC_FLASH_QMSI_WAIT_STATES
+	int "The number of flash wait states"
+	default 1
+	help
+	  Specify the number of wait states for Quark flash.
+
+config SOC_FLASH_QMSI_SYS_SIZE
+	hex "SOC system flash size"
+	help
+	  Specify system flash size on the Quark SOC.
+
+config SOC_FLASH_QMSI_API_REENTRANCY
+	bool "flash driver API reentrancy for QMSI shim driver"
+	default n
+	help
+	 Enable support for QMSI flash driver API reentrancy.
+
+endif # SOC_FLASH_QMSI

drivers/flash/Kconfig.w25qxxdv

@@ -0,0 +1,84 @@
+#
+# Copyright (c) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+
+menuconfig SPI_FLASH_W25QXXDV
+	bool
+	prompt "SPI NOR Flash Winbond W25QXXDV"
+	select FLASH_HAS_DRIVER_ENABLED
+	depends on SPI && FLASH
+
+if SPI_FLASH_W25QXXDV
+
+config SPI_FLASH_W25QXXDV_SPI_NAME
+	string
+	prompt "SPI controller device name"
+	default ""
+
+config SPI_FLASH_W25QXXDV_DRV_NAME
+	string
+	prompt "SPI flash device name"
+	default "W25QXXDV"
+
+config SPI_FLASH_W25QXXDV_INIT_PRIORITY
+	int
+	default 80
+	help
+	  Device driver initialization priority.
+	  Device is connected to SPI bus, it has to
+	  be initialized after SPI driver.
+
+config SPI_FLASH_W25QXXDV_SPI_FREQ_0
+	int "SPI system frequency"
+	default 8000000
+	help
+	  This option sets the SPI controller's frequency. Beware this value
+	  depends on the SPI controller being used and also on the system
+	  clock.
+
+config SPI_FLASH_W25QXXDV_SPI_SLAVE
+	int "SPI slave linked to SPI flash"
+	help
+	  This option sets the SPI slave number the SPI controller has to switch
+	  to when dealing with WinBond SPI flash chip.
+
+config SPI_FLASH_W25QXXDV_GPIO_SPI_CS
+	bool "Manage SPI CS through a GPIO pin"
+	default n
+	help
+	This option is useful if one needs to manage SPI CS through a GPIO
+	pin to by-pass the SPI controller's CS logic.
+
+config SPI_FLASH_W25QXXDV_GPIO_SPI_CS_DRV_NAME
+	string "GPIO driver's name to use to drive SPI CS through"
+	default ""
+	depends on SPI_FLASH_W25QXXDV_GPIO_SPI_CS
+	help
+	This option is mandatory to set which GPIO controller to use in order
+	to actually emulate the SPI CS.
+
+config SPI_FLASH_W25QXXDV_GPIO_SPI_CS_PIN
+	int "GPIO PIN to use to drive SPI CS through"
+	default 0
+	depends on SPI_FLASH_W25QXXDV_GPIO_SPI_CS
+	help
+	This option is mandatory to set which GPIO pin to use in order
+	to actually emulate the SPI CS.
+
+config SPI_FLASH_W25QXXDV_FLASH_SIZE
+	int "Flash size in bytes"
+	default 2097152
+	help
+	  This is the flash capacity in bytes.
+
+config SPI_FLASH_W25QXXDV_MAX_DATA_LEN
+	int
+	range 1 256
+	default 256
+	help
+	  Maximum transmit or receive data length in one user data frame.
+
+endif # SPI_FLASH_W25QXXDV