mtd: Tighten some driver dependencies

The ALTERA_QSPI driver conflicts with the regular FLASH_CFI_DRIVER as
both implement the same high level functionality and so use the same
global namespace. In a similar fashion, all NAND drivers are mutually
exclusive due to namespace collisions. For the remaining drivers which
did not already have some architecture specific dependency, add them.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 86752b5926de27ea739f04af24c5af196633a531..21b8b21f6b22ee494d277b05b5081b27a6c341cc 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -186,7 +186,7 @@ config FLASH_VERIFY
 
 config ALTERA_QSPI
        bool "Altera Generic Quad SPI Controller"
-       depends on DM_MTD
+       depends on DM_MTD && !FLASH_CFI_DRIVER
        select USE_SYS_MAX_FLASH_BANKS
        help
          This enables access to Altera EPCQ/EPCS flash chips using the

diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index c76c10e1ef90387745078667f902c2401aab08b0..1bd33a200c1be76681b7f0ee0210b47c6a943370 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -218,7 +218,7 @@ config NAND_DENALI_DT
        bool "Support Denali NAND controller as a DT device"
        select NAND_DENALI
        select SPL_SYS_NAND_SELF_INIT
-       depends on OF_CONTROL && DM_MTD
+       depends on OF_CONTROL && DM_MTD && (ARCH_SOCFPGA || ARCH_UNIPHIER)
        help
          Enable the driver for NAND flash on platforms using a Denali NAND
          controller as a DT device.
@@ -400,6 +400,7 @@ endif
 
 config NAND_VF610_NFC
        bool "Support for Freescale NFC for VF610"
+       depends on ARCH_VF610
        select SYS_NAND_SELF_INIT
        select SYS_NAND_DRIVER_ECC_LAYOUT
        imply CMD_NAND