Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c1a1158 authored by Kyle Spaans's avatar Kyle Spaans Committed by David Woodhouse
Browse files

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: default avatarKyle Spaans <kspaans@uwaterloo.ca>
Reviewed-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 6c499398

drivers/mtd/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -319,7 +319,6 @@ config SM_FTL 




config MTD_OOPS

config MTD_OOPS

	tristate "Log panic/oops to an MTD buffer"

	tristate "Log panic/oops to an MTD buffer"

	depends on MTD

	help

	help

	  This enables panic and oops messages to be logged to a circular

	  This enables panic and oops messages to be logged to a circular

	  buffer in a flash partition where it can be read back at some

	  buffer in a flash partition where it can be read back at some

drivers/mtd/nand/Kconfig

+14 −16
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ config MTD_SM_COMMON 




config MTD_NAND_MUSEUM_IDS

config MTD_NAND_MUSEUM_IDS

	bool "Enable chip ids for obsolete ancient NAND devices"

	bool "Enable chip ids for obsolete ancient NAND devices"

	depends on MTD_NAND

	default n

	default n

	help

	help

	  Enable this option only when your board has first generation

	  Enable this option only when your board has first generation
@@ -101,13 +100,13 @@ config MTD_NAND_AMS_DELTA 




config MTD_NAND_OMAP2

config MTD_NAND_OMAP2

	tristate "NAND Flash device on OMAP2 and OMAP3"

	tristate "NAND Flash device on OMAP2 and OMAP3"

	depends on ARM && MTD_NAND && (ARCH_OMAP2 || ARCH_OMAP3)

	depends on ARM && (ARCH_OMAP2 || ARCH_OMAP3)

	help

	help

          Support for NAND flash on Texas Instruments OMAP2 and OMAP3 platforms.

          Support for NAND flash on Texas Instruments OMAP2 and OMAP3 platforms.





config MTD_NAND_OMAP_PREFETCH

config MTD_NAND_OMAP_PREFETCH

	bool "GPMC prefetch support for NAND Flash device"

	bool "GPMC prefetch support for NAND Flash device"

	depends on MTD_NAND && MTD_NAND_OMAP2

	depends on MTD_NAND_OMAP2

	default y

	default y

	help

	help

	 The NAND device can be accessed for Read/Write using GPMC PREFETCH engine

	 The NAND device can be accessed for Read/Write using GPMC PREFETCH engine
@@ -146,7 +145,7 @@ config MTD_NAND_AU1550 




config MTD_NAND_BF5XX

config MTD_NAND_BF5XX

	tristate "Blackfin on-chip NAND Flash Controller driver"

	tristate "Blackfin on-chip NAND Flash Controller driver"

	depends on (BF54x || BF52x) && MTD_NAND

	depends on BF54x || BF52x

	help

	help

	  This enables the Blackfin on-chip NAND flash controller

	  This enables the Blackfin on-chip NAND flash controller
@@ -236,7 +235,7 @@ config MTD_NAND_S3C2410_CLKSTOP 




config MTD_NAND_BCM_UMI

config MTD_NAND_BCM_UMI

	tristate "NAND Flash support for BCM Reference Boards"

	tristate "NAND Flash support for BCM Reference Boards"

	depends on ARCH_BCMRING && MTD_NAND

	depends on ARCH_BCMRING

	help

	help

	  This enables the NAND flash controller on the BCM UMI block.

	  This enables the NAND flash controller on the BCM UMI block.
@@ -395,7 +394,7 @@ endchoice 




config MTD_NAND_PXA3xx

config MTD_NAND_PXA3xx

	tristate "Support for NAND flash devices on PXA3xx"

	tristate "Support for NAND flash devices on PXA3xx"

	depends on MTD_NAND && (PXA3xx || ARCH_MMP)

	depends on PXA3xx || ARCH_MMP

	help

	help

	  This enables the driver for the NAND flash device found on

	  This enables the driver for the NAND flash device found on

	  PXA3xx processors

	  PXA3xx processors
@@ -409,18 +408,18 @@ config MTD_NAND_PXA3xx_BUILTIN 




config MTD_NAND_CM_X270

config MTD_NAND_CM_X270

	tristate "Support for NAND Flash on CM-X270 modules"

	tristate "Support for NAND Flash on CM-X270 modules"

	depends on MTD_NAND && MACH_ARMCORE

	depends on MACH_ARMCORE





config MTD_NAND_PASEMI

config MTD_NAND_PASEMI

	tristate "NAND support for PA Semi PWRficient"

	tristate "NAND support for PA Semi PWRficient"

	depends on MTD_NAND && PPC_PASEMI

	depends on PPC_PASEMI

	help

	help

	  Enables support for NAND Flash interface on PA Semi PWRficient

	  Enables support for NAND Flash interface on PA Semi PWRficient

	  based boards

	  based boards





config MTD_NAND_TMIO

config MTD_NAND_TMIO

	tristate "NAND Flash device on Toshiba Mobile IO Controller"

	tristate "NAND Flash device on Toshiba Mobile IO Controller"

	depends on MTD_NAND && MFD_TMIO

	depends on MFD_TMIO

	help

	help

	  Support for NAND flash connected to a Toshiba Mobile IO

	  Support for NAND flash connected to a Toshiba Mobile IO

	  Controller in some PDAs, including the Sharp SL6000x.

	  Controller in some PDAs, including the Sharp SL6000x.
@@ -434,7 +433,6 @@ config MTD_NAND_NANDSIM 




config MTD_NAND_PLATFORM

config MTD_NAND_PLATFORM

	tristate "Support for generic platform NAND driver"

	tristate "Support for generic platform NAND driver"

	depends on MTD_NAND

	help

	help

	  This implements a generic NAND driver for on-SOC platform

	  This implements a generic NAND driver for on-SOC platform

	  devices. You will need to provide platform-specific functions

	  devices. You will need to provide platform-specific functions
@@ -442,14 +440,14 @@ config MTD_NAND_PLATFORM 




config MTD_ALAUDA

config MTD_ALAUDA

	tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"

	tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"

	depends on MTD_NAND && USB

	depends on USB

	help

	help

	  These two (and possibly other) Alauda-based cardreaders for

	  These two (and possibly other) Alauda-based cardreaders for

	  SmartMedia and xD allow raw flash access.

	  SmartMedia and xD allow raw flash access.





config MTD_NAND_ORION

config MTD_NAND_ORION

	tristate "NAND Flash support for Marvell Orion SoC"

	tristate "NAND Flash support for Marvell Orion SoC"

	depends on PLAT_ORION && MTD_NAND

	depends on PLAT_ORION

	help

	help

	  This enables the NAND flash controller on Orion machines.

	  This enables the NAND flash controller on Orion machines.
@@ -458,7 +456,7 @@ config MTD_NAND_ORION 




config MTD_NAND_FSL_ELBC

config MTD_NAND_FSL_ELBC

	tristate "NAND support for Freescale eLBC controllers"

	tristate "NAND support for Freescale eLBC controllers"

	depends on MTD_NAND && PPC_OF

	depends on PPC_OF

	help

	help

	  Various Freescale chips, including the 8313, include a NAND Flash

	  Various Freescale chips, including the 8313, include a NAND Flash

	  Controller Module with built-in hardware ECC capabilities.

	  Controller Module with built-in hardware ECC capabilities.
@@ -467,7 +465,7 @@ config MTD_NAND_FSL_ELBC 




config MTD_NAND_FSL_UPM

config MTD_NAND_FSL_UPM

	tristate "Support for NAND on Freescale UPM"

	tristate "Support for NAND on Freescale UPM"

	depends on MTD_NAND && (PPC_83xx || PPC_85xx)

	depends on PPC_83xx || PPC_85xx

	select FSL_LBC

	select FSL_LBC

	help

	help

	  Enables support for NAND Flash chips wired onto Freescale PowerPC

	  Enables support for NAND Flash chips wired onto Freescale PowerPC
@@ -495,7 +493,7 @@ config MTD_NAND_NOMADIK 




config MTD_NAND_SH_FLCTL

config MTD_NAND_SH_FLCTL

	tristate "Support for NAND on Renesas SuperH FLCTL"

	tristate "Support for NAND on Renesas SuperH FLCTL"

	depends on MTD_NAND && (SUPERH || ARCH_SHMOBILE)

	depends on SUPERH || ARCH_SHMOBILE

	help

	help

	  Several Renesas SuperH CPU has FLCTL. This option enables support

	  Several Renesas SuperH CPU has FLCTL. This option enables support

	  for NAND Flash using FLCTL.

	  for NAND Flash using FLCTL.
@@ -515,7 +513,7 @@ config MTD_NAND_TXX9NDFMC 




config MTD_NAND_SOCRATES

config MTD_NAND_SOCRATES

	tristate "Support for NAND on Socrates board"

	tristate "Support for NAND on Socrates board"

	depends on MTD_NAND && SOCRATES

	depends on SOCRATES

	help

	help

	  Enables support for NAND Flash chips wired onto Socrates board.

	  Enables support for NAND Flash chips wired onto Socrates board.

drivers/mtd/onenand/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -25,14 +25,14 @@ config MTD_ONENAND_GENERIC 




config MTD_ONENAND_OMAP2

config MTD_ONENAND_OMAP2

	tristate "OneNAND on OMAP2/OMAP3 support"

	tristate "OneNAND on OMAP2/OMAP3 support"

	depends on MTD_ONENAND && (ARCH_OMAP2 || ARCH_OMAP3)

	depends on ARCH_OMAP2 || ARCH_OMAP3

	help

	help

	  Support for a OneNAND flash device connected to an OMAP2/OMAP3 CPU

	  Support for a OneNAND flash device connected to an OMAP2/OMAP3 CPU

	  via the GPMC memory controller.

	  via the GPMC memory controller.





config MTD_ONENAND_SAMSUNG

config MTD_ONENAND_SAMSUNG

        tristate "OneNAND on Samsung SOC controller support"

        tristate "OneNAND on Samsung SOC controller support"

        depends on MTD_ONENAND && (ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210)

        depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210

        help

        help

          Support for a OneNAND flash device connected to an Samsung SOC

          Support for a OneNAND flash device connected to an Samsung SOC

          S3C64XX/S5PC1XX controller.

          S3C64XX/S5PC1XX controller.