[PATCH] nor flash: integrate into mtd

[Sascha Hauer]

On Sun, Feb 17, 2013 at 11:59:14AM +0100, Alexander Aring wrote:
> Hi, 
> 
> > > diff --git a/drivers/nor/Kconfig b/drivers/mtd/nor/Kconfig
> > > similarity index 96%
> > > rename from drivers/nor/Kconfig
> > > rename to drivers/mtd/nor/Kconfig
> > > index c8ce24f..591d1ac 100644
> > > --- a/drivers/nor/Kconfig
> > > +++ b/drivers/mtd/nor/Kconfig
> > > @@ -1,7 +1,5 @@
> > > -menu "flash drivers"
> > > -
> > >  menuconfig DRIVER_CFI
> > > -	bool "CFI"
> > > +	bool "CFI NOR flash support"
> > >  	help
> > >  	  If you have NOR Flash devices connected to your system and wish
> > >  	  to use them say yes here.
> > > @@ -55,5 +53,3 @@ config CFI_BUFFER_WRITE
> > >  	depends on DRIVER_CFI || DRIVER_CFI
> 
> "DRIVER_CFI || DRIVER_CFI" looks weird. :-)
> 
> Why we not set this to depends on MTD instead of adding support for mtd
> in each config file?

Hm, this indeed looks weird. Since the Kconfig file is just moved and
not touched, I don't want to squash a fixup into it. Instead how about
the following?

8<------------------------------------------------

>From ef06284cd947c4e90a54a62d2c106789c6eaebe8 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer at pengutronix.de>
Date: Mon, 18 Feb 2013 11:21:47 +0100
Subject: [PATCH] mtd nor: remove unnecessary 'depend' in Kconfig

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 drivers/mtd/nor/Kconfig |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/mtd/nor/Kconfig b/drivers/mtd/nor/Kconfig
index 591d1ac..44a4184 100644
--- a/drivers/mtd/nor/Kconfig
+++ b/drivers/mtd/nor/Kconfig
@@ -8,17 +8,14 @@ if DRIVER_CFI
 
 config DRIVER_CFI_INTEL
 	default y
-	depends on DRIVER_CFI
 	bool "Support Intel flash chips"
 
 config DRIVER_CFI_AMD
 	default y
-	depends on DRIVER_CFI
 	bool "support AMD flash chips"
 
 config DRIVER_CFI_BANK_WIDTH_1
 	bool "Support 8-bit buswidth"
-	depends on DRIVER_CFI
 	default y
 	help
 	  If you wish to support CFI devices on a physical bus which is
@@ -26,7 +23,6 @@ config DRIVER_CFI_BANK_WIDTH_1
 
 config DRIVER_CFI_BANK_WIDTH_2
 	bool "Support 16-bit buswidth"
-	depends on DRIVER_CFI
 	default y
 	help
 	  If you wish to support CFI devices on a physical bus which is
@@ -34,7 +30,6 @@ config DRIVER_CFI_BANK_WIDTH_2
 
 config DRIVER_CFI_BANK_WIDTH_4
 	bool "Support 32-bit buswidth"
-	depends on DRIVER_CFI
 	default y
 	help
 	  If you wish to support CFI devices on a physical bus which is
@@ -42,14 +37,11 @@ config DRIVER_CFI_BANK_WIDTH_4
 
 config DRIVER_CFI_BANK_WIDTH_8
 	bool "Support 64-bit buswidth"
-	depends on DRIVER_CFI
-	default n
 	help
 	  If you wish to support CFI devices on a physical bus which is
 	  64 bits wide, say 'Y'.
 
 config CFI_BUFFER_WRITE
 	bool "use cfi driver with buffer write"
-	depends on DRIVER_CFI || DRIVER_CFI
 
 endif
-- 
1.7.10.4


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |