Commit 6a8a98b2 authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse
Browse files

mtd: kill CONFIG_MTD_PARTITIONS 



Now that none of the drivers use CONFIG_MTD_PARTITIONS we can remove
it from Kconfig and the last remaining uses.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent eea72d5f

Documentation/DocBook/mtdnand.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ static void __iomem *baseaddr; 
		<title>Partition defines</title>

		<para>

			If you want to divide your device into partitions, then

			enable the configuration switch CONFIG_MTD_PARTITIONS and define

			a partitioning scheme suitable to your board.

			define a partitioning scheme suitable to your board.

		</para>

		<programlisting>

#define NUM_PARTITIONS 2

drivers/mtd/Kconfig

+1 −9
Original line number Diff line number Diff line 
menuconfig MTD

	tristate "Memory Technology Device (MTD) support"

	depends on HAS_IOMEM

	select MTD_PARTITIONS

	help

	  Memory Technology Devices are flash, RAM and similar chips, often

	  used for solid state file systems on embedded devices. This option
@@ -34,11 +33,6 @@ config MTD_TESTS 
	  should normally be compiled as kernel modules. The modules perform

	  various checks and verifications when loaded.



config MTD_PARTITIONS

	bool



if MTD_PARTITIONS



config MTD_REDBOOT_PARTS

	tristate "RedBoot partition table parsing"

	---help---
@@ -91,7 +85,7 @@ endif # MTD_REDBOOT_PARTS 


config MTD_CMDLINE_PARTS

	bool "Command line partition table parsing"

	depends on MTD_PARTITIONS = "y" && MTD = "y"

	depends on MTD = "y"

	---help---

	  Allow generic configuration of the MTD partition tables via the kernel

	  command line. Multiple flash resources are supported for hardware where
@@ -156,8 +150,6 @@ config MTD_AR7_PARTS 
	---help---

	  TI AR7 partitioning support



endif # MTD_PARTITIONS



comment "User Modules And Translation Layers"



config MTD_CHAR

drivers/mtd/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 


# Core functionality.

obj-$(CONFIG_MTD)		+= mtd.o

mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o

mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o

mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o

mtd-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o



obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o

drivers/mtd/maps/Kconfig

+5 −9
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ config MTD_PHYSMAP_OF 
config MTD_PMC_MSP_EVM

	tristate "CFI Flash device mapped on PMC-Sierra MSP"

	depends on PMC_MSP && MTD_CFI

	select MTD_PARTITIONS

	help

	  This provides a 'mapping' driver which supports the way

	  in which user-programmable flash chips are connected on the
@@ -122,7 +121,7 @@ config MTD_SC520CDP 


config MTD_NETSC520

	tristate "CFI Flash device mapped on AMD NetSc520"

	depends on X86 && MTD_CFI && MTD_PARTITIONS

	depends on X86 && MTD_CFI

	help

	  This enables access routines for the flash chips on the AMD NetSc520

	  demonstration board. If you have one of these boards and would like
@@ -131,7 +130,6 @@ config MTD_NETSC520 
config MTD_TS5500

	tristate "JEDEC Flash device mapped on Technologic Systems TS-5500"

	depends on X86

	select MTD_PARTITIONS

	select MTD_JEDECPROBE

	select MTD_CFI_AMDSTD

	help
@@ -149,7 +147,7 @@ config MTD_TS5500 


config MTD_SBC_GXX

	tristate "CFI Flash device mapped on Arcom SBC-GXx boards"

	depends on X86 && MTD_CFI_INTELEXT && MTD_PARTITIONS && MTD_COMPLEX_MAPPINGS

	depends on X86 && MTD_CFI_INTELEXT && MTD_COMPLEX_MAPPINGS

	help

	  This provides a driver for the on-board flash of Arcom Control

	  Systems' SBC-GXn family of boards, formerly known as SBC-MediaGX.
@@ -246,7 +244,7 @@ config MTD_TSUNAMI 


config MTD_NETtel

	tristate "CFI flash device on SnapGear/SecureEdge"

	depends on X86 && MTD_PARTITIONS && MTD_JEDECPROBE

	depends on X86 && MTD_JEDECPROBE

	help

	  Support for flash chips on NETtel/SecureEdge/SnapGear boards.
@@ -261,7 +259,7 @@ config MTD_BCM963XX 


config MTD_DILNETPC

	tristate "CFI Flash device mapped on DIL/Net PC"

	depends on X86 && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN

	depends on X86 && MTD_CFI_INTELEXT && BROKEN

	help

	  MTD map driver for SSV DIL/Net PC Boards "DNP" and "ADNP".

	  For details, see <http://www.ssv-embedded.de/ssv/pc104/p169.htm>
@@ -381,7 +379,7 @@ config MTD_IXP2000 


config MTD_FORTUNET

	tristate "CFI Flash device mapped on the FortuNet board"

	depends on MTD_CFI && MTD_PARTITIONS && SA1100_FORTUNET

	depends on MTD_CFI && SA1100_FORTUNET

	help

	  This enables access to the Flash on the FortuNet board.  If you

	  have such a board, say 'Y'.
@@ -479,7 +477,6 @@ config MTD_UCLINUX 
config MTD_WRSBC8260

	tristate "Map driver for WindRiver PowerQUICC II MPC82xx board"

	depends on (SBC82xx || SBC8560)

	select MTD_PARTITIONS

	select MTD_MAP_BANK_WIDTH_4

	select MTD_MAP_BANK_WIDTH_1

	select MTD_CFI_I1
@@ -492,7 +489,6 @@ config MTD_WRSBC8260 
config MTD_DMV182

        tristate "Map driver for Dy-4 SVME/DMV-182 board."

        depends on DMV182

        select MTD_PARTITIONS

	select MTD_MAP_BANK_WIDTH_32

	select MTD_CFI_I8

	select MTD_CFI_AMDSTD

drivers/mtd/mtdchar.c

+0 −5
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ static int shrink_ecclayout(const struct nand_ecclayout *from, 
	return 0;

}



#ifdef CONFIG_MTD_PARTITIONS

static int mtd_blkpg_ioctl(struct mtd_info *mtd,

			   struct blkpg_ioctl_arg __user *arg)

{
@@ -544,8 +543,6 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd, 
		return -EINVAL;

	}

}

#endif





static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)

{
@@ -937,7 +934,6 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg) 
		break;

	}



#ifdef CONFIG_MTD_PARTITIONS

	case BLKPG:

	{

		ret = mtd_blkpg_ioctl(mtd,
@@ -951,7 +947,6 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg) 
		ret = 0;

		break;

	}

#endif



	default:

		ret = -ENOTTY;