Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[powerpc.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index fa74668..f457315 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -60,6 +60,15 @@ config MTD_PHYSMAP_BANKWIDTH
          Ignore this option if you use run-time physmap configuration
          (i.e., run-time calling physmap_configure()).
 
          Ignore this option if you use run-time physmap configuration
          (i.e., run-time calling physmap_configure()).
 

+config MTD_PHYSMAP_OF
+       tristate "Flash device in physical memory map based on OF descirption"
+       depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
+       help
+         This provides a 'mapping' driver which allows the NOR Flash and
+         ROM driver code to communicate with chips which are mapped
+         physically into the CPU's memory. The mapping description here is
+         taken from OF device tree.
+

 config MTD_SUN_UFLASH
        tristate "Sun Microsystems userflash support"
        depends on SPARC && MTD_CFI
 config MTD_SUN_UFLASH
        tristate "Sun Microsystems userflash support"
        depends on SPARC && MTD_CFI


@@ -186,7 +195,7 @@ config MTD_ICHXROM
 
 config MTD_ESB2ROM
         tristate "BIOS flash chip on Intel ESB Controller Hub 2"
 
 config MTD_ESB2ROM
         tristate "BIOS flash chip on Intel ESB Controller Hub 2"

-        depends on X86 && MTD_JEDECPROBE
+        depends on X86 && MTD_JEDECPROBE && PCI

         help
           Support for treating the BIOS flash chip on ESB2 motherboards
           as an MTD device - with this you can reprogram your BIOS.
         help
           Support for treating the BIOS flash chip on ESB2 motherboards
           as an MTD device - with this you can reprogram your BIOS.


@@ -373,50 +382,6 @@ config MTD_TQM834x
          TQ Components TQM834x boards. If you have one of these boards
          and would like to use the flash chips on it, say 'Y'.
 
          TQ Components TQM834x boards. If you have one of these boards
          and would like to use the flash chips on it, say 'Y'.
 

-config MTD_CSTM_MIPS_IXX
-       tristate "Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board"
-       depends on MIPS && MTD_CFI && MTD_JEDECPROBE && MTD_PARTITIONS
-       help
-         This provides a mapping driver for the Integrated Technology
-         Express, Inc (ITE) QED-4N-S01B eval board and the Globespan IVR
-         Reference Board. It provides the necessary addressing, length,
-         buswidth, vpp code and addition setup of the flash device for
-         these boards. In addition, this mapping driver can be used for
-         other boards via setting of the CONFIG_MTD_CSTM_MIPS_IXX_START/
-         LEN/BUSWIDTH parameters. This mapping will provide one mtd device
-         using one partition. The start address can be offset from the
-         beginning of flash and the len can be less than the total flash
-         device size to allow a window into the flash. Both CFI and JEDEC
-         probes are called.
-
-config MTD_CSTM_MIPS_IXX_START
-       hex "Physical start address of flash mapping"
-       depends on MTD_CSTM_MIPS_IXX
-       default "0x8000000"
-       help
-         This is the physical memory location that the MTD driver will
-         use for the flash chips on your particular target board.
-         Refer to the memory map which should hopefully be in the
-         documentation for your board.
-
-config MTD_CSTM_MIPS_IXX_LEN
-       hex "Physical length of flash mapping"
-       depends on MTD_CSTM_MIPS_IXX
-       default "0x4000000"
-       help
-         This is the total length that the MTD driver will use for the
-         flash chips on your particular board.  Refer to the memory
-         map which should hopefully be in the documentation for your
-         board.
-
-config MTD_CSTM_MIPS_IXX_BUSWIDTH
-       int "Bus width in octets"
-       depends on MTD_CSTM_MIPS_IXX
-       default "2"
-       help
-         This is the total bus width of the mapping of the flash chips
-         on your particular board.
-

 config MTD_OCELOT
        tristate "Momenco Ocelot boot flash device"
        depends on MIPS && MOMENCO_OCELOT
 config MTD_OCELOT
        tristate "Momenco Ocelot boot flash device"
        depends on MIPS && MOMENCO_OCELOT


@@ -625,7 +590,7 @@ config MTD_BAST_MAXSIZE
        default "4"
 
 config MTD_SHARP_SL
        default "4"
 
 config MTD_SHARP_SL

-       bool "ROM maped on Sharp SL Series"
+       bool "ROM mapped on Sharp SL Series"

        depends on MTD && ARCH_PXA
        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.
        depends on MTD && ARCH_PXA
        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.