aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Spaans <kspaans@uwaterloo.ca>2010-06-08 09:48:22 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-08-02 04:01:42 -0400
commit8c1a1158c98b810d34b469c787840ac16904e5fa (patch)
treeb9d033bc79946ee05c01ecdb05fc2b744f312079
parent6c49939869c20550512386610ece45aceb65e7f4 (diff)
mtd: remove redundant dependency checks in Kconfig files
Look for dependency checks for "FOO" when inside of an "if FOO" block and remove them. Signed-off-by: Kyle Spaans <kspaans@uwaterloo.ca> Reviewed-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/Kconfig1
-rw-r--r--drivers/mtd/nand/Kconfig30
-rw-r--r--drivers/mtd/onenand/Kconfig4
3 files changed, 16 insertions, 19 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index f8210bf2d241..71eda03b925f 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -319,7 +319,6 @@ config SM_FTL
319 319
320config MTD_OOPS 320config MTD_OOPS
321 tristate "Log panic/oops to an MTD buffer" 321 tristate "Log panic/oops to an MTD buffer"
322 depends on MTD
323 help 322 help
324 This enables panic and oops messages to be logged to a circular 323 This enables panic and oops messages to be logged to a circular
325 buffer in a flash partition where it can be read back at some 324 buffer in a flash partition where it can be read back at some
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index ffc3720929f1..4d4066f315be 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -37,7 +37,6 @@ config MTD_SM_COMMON
37 37
38config MTD_NAND_MUSEUM_IDS 38config MTD_NAND_MUSEUM_IDS
39 bool "Enable chip ids for obsolete ancient NAND devices" 39 bool "Enable chip ids for obsolete ancient NAND devices"
40 depends on MTD_NAND
41 default n 40 default n
42 help 41 help
43 Enable this option only when your board has first generation 42 Enable this option only when your board has first generation
@@ -101,13 +100,13 @@ config MTD_NAND_AMS_DELTA
101 100
102config MTD_NAND_OMAP2 101config MTD_NAND_OMAP2
103 tristate "NAND Flash device on OMAP2 and OMAP3" 102 tristate "NAND Flash device on OMAP2 and OMAP3"
104 depends on ARM && MTD_NAND && (ARCH_OMAP2 || ARCH_OMAP3) 103 depends on ARM && (ARCH_OMAP2 || ARCH_OMAP3)
105 help 104 help
106 Support for NAND flash on Texas Instruments OMAP2 and OMAP3 platforms. 105 Support for NAND flash on Texas Instruments OMAP2 and OMAP3 platforms.
107 106
108config MTD_NAND_OMAP_PREFETCH 107config MTD_NAND_OMAP_PREFETCH
109 bool "GPMC prefetch support for NAND Flash device" 108 bool "GPMC prefetch support for NAND Flash device"
110 depends on MTD_NAND && MTD_NAND_OMAP2 109 depends on MTD_NAND_OMAP2
111 default y 110 default y
112 help 111 help
113 The NAND device can be accessed for Read/Write using GPMC PREFETCH engine 112 The NAND device can be accessed for Read/Write using GPMC PREFETCH engine
@@ -146,7 +145,7 @@ config MTD_NAND_AU1550
146 145
147config MTD_NAND_BF5XX 146config MTD_NAND_BF5XX
148 tristate "Blackfin on-chip NAND Flash Controller driver" 147 tristate "Blackfin on-chip NAND Flash Controller driver"
149 depends on (BF54x || BF52x) && MTD_NAND 148 depends on BF54x || BF52x
150 help 149 help
151 This enables the Blackfin on-chip NAND flash controller 150 This enables the Blackfin on-chip NAND flash controller
152 151
@@ -236,7 +235,7 @@ config MTD_NAND_S3C2410_CLKSTOP
236 235
237config MTD_NAND_BCM_UMI 236config MTD_NAND_BCM_UMI
238 tristate "NAND Flash support for BCM Reference Boards" 237 tristate "NAND Flash support for BCM Reference Boards"
239 depends on ARCH_BCMRING && MTD_NAND 238 depends on ARCH_BCMRING
240 help 239 help
241 This enables the NAND flash controller on the BCM UMI block. 240 This enables the NAND flash controller on the BCM UMI block.
242 241
@@ -395,7 +394,7 @@ endchoice
395 394
396config MTD_NAND_PXA3xx 395config MTD_NAND_PXA3xx
397 tristate "Support for NAND flash devices on PXA3xx" 396 tristate "Support for NAND flash devices on PXA3xx"
398 depends on MTD_NAND && (PXA3xx || ARCH_MMP) 397 depends on PXA3xx || ARCH_MMP
399 help 398 help
400 This enables the driver for the NAND flash device found on 399 This enables the driver for the NAND flash device found on
401 PXA3xx processors 400 PXA3xx processors
@@ -409,18 +408,18 @@ config MTD_NAND_PXA3xx_BUILTIN
409 408
410config MTD_NAND_CM_X270 409config MTD_NAND_CM_X270
411 tristate "Support for NAND Flash on CM-X270 modules" 410 tristate "Support for NAND Flash on CM-X270 modules"
412 depends on MTD_NAND && MACH_ARMCORE 411 depends on MACH_ARMCORE
413 412
414config MTD_NAND_PASEMI 413config MTD_NAND_PASEMI
415 tristate "NAND support for PA Semi PWRficient" 414 tristate "NAND support for PA Semi PWRficient"
416 depends on MTD_NAND && PPC_PASEMI 415 depends on PPC_PASEMI
417 help 416 help
418 Enables support for NAND Flash interface on PA Semi PWRficient 417 Enables support for NAND Flash interface on PA Semi PWRficient
419 based boards 418 based boards
420 419
421config MTD_NAND_TMIO 420config MTD_NAND_TMIO
422 tristate "NAND Flash device on Toshiba Mobile IO Controller" 421 tristate "NAND Flash device on Toshiba Mobile IO Controller"
423 depends on MTD_NAND && MFD_TMIO 422 depends on MFD_TMIO
424 help 423 help
425 Support for NAND flash connected to a Toshiba Mobile IO 424 Support for NAND flash connected to a Toshiba Mobile IO
426 Controller in some PDAs, including the Sharp SL6000x. 425 Controller in some PDAs, including the Sharp SL6000x.
@@ -434,7 +433,6 @@ config MTD_NAND_NANDSIM
434 433
435config MTD_NAND_PLATFORM 434config MTD_NAND_PLATFORM
436 tristate "Support for generic platform NAND driver" 435 tristate "Support for generic platform NAND driver"
437 depends on MTD_NAND
438 help 436 help
439 This implements a generic NAND driver for on-SOC platform 437 This implements a generic NAND driver for on-SOC platform
440 devices. You will need to provide platform-specific functions 438 devices. You will need to provide platform-specific functions
@@ -442,14 +440,14 @@ config MTD_NAND_PLATFORM
442 440
443config MTD_ALAUDA 441config MTD_ALAUDA
444 tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1" 442 tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"
445 depends on MTD_NAND && USB 443 depends on USB
446 help 444 help
447 These two (and possibly other) Alauda-based cardreaders for 445 These two (and possibly other) Alauda-based cardreaders for
448 SmartMedia and xD allow raw flash access. 446 SmartMedia and xD allow raw flash access.
449 447
450config MTD_NAND_ORION 448config MTD_NAND_ORION
451 tristate "NAND Flash support for Marvell Orion SoC" 449 tristate "NAND Flash support for Marvell Orion SoC"
452 depends on PLAT_ORION && MTD_NAND 450 depends on PLAT_ORION
453 help 451 help
454 This enables the NAND flash controller on Orion machines. 452 This enables the NAND flash controller on Orion machines.
455 453
@@ -458,7 +456,7 @@ config MTD_NAND_ORION
458 456
459config MTD_NAND_FSL_ELBC 457config MTD_NAND_FSL_ELBC
460 tristate "NAND support for Freescale eLBC controllers" 458 tristate "NAND support for Freescale eLBC controllers"
461 depends on MTD_NAND && PPC_OF 459 depends on PPC_OF
462 help 460 help
463 Various Freescale chips, including the 8313, include a NAND Flash 461 Various Freescale chips, including the 8313, include a NAND Flash
464 Controller Module with built-in hardware ECC capabilities. 462 Controller Module with built-in hardware ECC capabilities.
@@ -467,7 +465,7 @@ config MTD_NAND_FSL_ELBC
467 465
468config MTD_NAND_FSL_UPM 466config MTD_NAND_FSL_UPM
469 tristate "Support for NAND on Freescale UPM" 467 tristate "Support for NAND on Freescale UPM"
470 depends on MTD_NAND && (PPC_83xx || PPC_85xx) 468 depends on PPC_83xx || PPC_85xx
471 select FSL_LBC 469 select FSL_LBC
472 help 470 help
473 Enables support for NAND Flash chips wired onto Freescale PowerPC 471 Enables support for NAND Flash chips wired onto Freescale PowerPC
@@ -495,7 +493,7 @@ config MTD_NAND_NOMADIK
495 493
496config MTD_NAND_SH_FLCTL 494config MTD_NAND_SH_FLCTL
497 tristate "Support for NAND on Renesas SuperH FLCTL" 495 tristate "Support for NAND on Renesas SuperH FLCTL"
498 depends on MTD_NAND && (SUPERH || ARCH_SHMOBILE) 496 depends on SUPERH || ARCH_SHMOBILE
499 help 497 help
500 Several Renesas SuperH CPU has FLCTL. This option enables support 498 Several Renesas SuperH CPU has FLCTL. This option enables support
501 for NAND Flash using FLCTL. 499 for NAND Flash using FLCTL.
@@ -515,7 +513,7 @@ config MTD_NAND_TXX9NDFMC
515 513
516config MTD_NAND_SOCRATES 514config MTD_NAND_SOCRATES
517 tristate "Support for NAND on Socrates board" 515 tristate "Support for NAND on Socrates board"
518 depends on MTD_NAND && SOCRATES 516 depends on SOCRATES
519 help 517 help
520 Enables support for NAND Flash chips wired onto Socrates board. 518 Enables support for NAND Flash chips wired onto Socrates board.
521 519
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
index 9a49d68ba5f9..3f32289fdbb5 100644
--- a/drivers/mtd/onenand/Kconfig
+++ b/drivers/mtd/onenand/Kconfig
@@ -25,14 +25,14 @@ config MTD_ONENAND_GENERIC
25 25
26config MTD_ONENAND_OMAP2 26config MTD_ONENAND_OMAP2
27 tristate "OneNAND on OMAP2/OMAP3 support" 27 tristate "OneNAND on OMAP2/OMAP3 support"
28 depends on MTD_ONENAND && (ARCH_OMAP2 || ARCH_OMAP3) 28 depends on ARCH_OMAP2 || ARCH_OMAP3
29 help 29 help
30 Support for a OneNAND flash device connected to an OMAP2/OMAP3 CPU 30 Support for a OneNAND flash device connected to an OMAP2/OMAP3 CPU
31 via the GPMC memory controller. 31 via the GPMC memory controller.
32 32
33config MTD_ONENAND_SAMSUNG 33config MTD_ONENAND_SAMSUNG
34 tristate "OneNAND on Samsung SOC controller support" 34 tristate "OneNAND on Samsung SOC controller support"
35 depends on MTD_ONENAND && (ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210) 35 depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210
36 help 36 help
37 Support for a OneNAND flash device connected to an Samsung SOC 37 Support for a OneNAND flash device connected to an Samsung SOC
38 S3C64XX/S5PC1XX controller. 38 S3C64XX/S5PC1XX controller.