[MTD] [MAPS] fix plat-ram printk format

[safe/jmp/linux-2.6] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 83d0b2a..d990d81 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -6,20 +6,19 @@ menu "Mapping drivers for chip access"
 
 config MTD_COMPLEX_MAPPINGS
        bool "Support non-linear mappings of flash chips"
 
 config MTD_COMPLEX_MAPPINGS
        bool "Support non-linear mappings of flash chips"

-       depends on MTD

        help
          This causes the chip drivers to allow for complicated
          paged mappings of flash chips.
 
 config MTD_PHYSMAP
        tristate "CFI Flash device in physical memory map"
        help
          This causes the chip drivers to allow for complicated
          paged mappings of flash chips.
 
 config MTD_PHYSMAP
        tristate "CFI Flash device in physical memory map"

-       depends on MTD_CFI
+       depends on MTD_CFI || MTD_JEDECPROBE || MTD_ROM

        help
        help

-         This provides a 'mapping' driver which allows the CFI probe and
-         command set driver code to communicate with flash chips which
-         are mapped physically into the CPU's memory. You will need to
-         configure the physical address and size of the flash chips on
-         your particular board as well as the bus width, either statically
+         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. You will need to configure
+         the physical address and size of the flash chips on your
+         particular board as well as the bus width, either statically

          with config options or at run-time.
 
 config MTD_PHYSMAP_START
          with config options or at run-time.
 
 config MTD_PHYSMAP_START


@@ -60,6 +59,48 @@ 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_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 support the way
+          in which user-programmable flash chips are connected on the
+          PMC-Sierra MSP eval/demo boards
+
+choice
+       prompt "Maximum mappable memory avialable for flash IO"
+       depends on MTD_PMC_MSP_EVM
+       default MSP_FLASH_MAP_LIMIT_32M
+
+config MSP_FLASH_MAP_LIMIT_32M
+       bool "32M"
+
+endchoice
+
+config MSP_FLASH_MAP_LIMIT
+       hex
+       default "0x02000000"
+       depends on MSP_FLASH_MAP_LIMIT_32M
+
+config MTD_PMC_MSP_RAMROOT
+       tristate "Embedded RAM block device for root on PMC-Sierra MSP"
+       depends on PMC_MSP_EMBEDDED_ROOTFS && \
+                       (MTD_BLOCK || MTD_BLOCK_RO) && \
+                       MTD_RAM
+       help
+         This provides support for the embedded root file system
+          on PMC MSP devices.  This memory is mapped as a MTD block device.
+

 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


@@ -184,6 +225,24 @@ config MTD_ICHXROM
 
          BE VERY CAREFUL.
 
 
          BE VERY CAREFUL.
 

+config MTD_ESB2ROM
+        tristate "BIOS flash chip on Intel ESB Controller Hub 2"
+        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.
+
+          BE VERY CAREFUL.
+
+config MTD_CK804XROM
+       tristate "BIOS flash chip on Nvidia CK804"
+       depends on X86 && MTD_JEDECPROBE && PCI
+       help
+         Support for treating the BIOS flash chip on nvidia motherboards
+         as an MTD device - with this you can reprogram your BIOS.
+
+         BE VERY CAREFUL.
+

 config MTD_SCB2_FLASH
        tristate "BIOS flash chip on Intel SCB2 boards"
        depends on X86 && MTD_JEDECPROBE
 config MTD_SCB2_FLASH
        tristate "BIOS flash chip on Intel SCB2 boards"
        depends on X86 && MTD_JEDECPROBE


@@ -213,13 +272,13 @@ config MTD_NETtel
 
 config MTD_ALCHEMY
        tristate "AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support"
 
 config MTD_ALCHEMY
        tristate "AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support"

-       depends on SOC_AU1X00
+       depends on SOC_AU1X00 && MTD_PARTITIONS && MTD_CFI

        help
          Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
 
 config MTD_MTX1
        tristate "4G Systems MTX-1 Flash device"
        help
          Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
 
 config MTD_MTX1
        tristate "4G Systems MTX-1 Flash device"

-       depends on MIPS && MIPS_MTX1
+       depends on MIPS_MTX1 && MTD_CFI

        help
          Flash memory access on 4G Systems MTX-1 Board. If you have one of
          these boards and would like to use the flash chips on it, say 'Y'.
        help
          Flash memory access on 4G Systems MTX-1 Board. If you have one of
          these boards and would like to use the flash chips on it, say 'Y'.


@@ -355,53 +414,9 @@ 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"
 config MTD_OCELOT
        tristate "Momenco Ocelot boot flash device"

-       depends on MIPS && MOMENCO_OCELOT
+       depends on MOMENCO_OCELOT

        help
          This enables access routines for the boot flash device and for the
          NVRAM on the Momenco Ocelot board. If you have one of these boards
        help
          This enables access routines for the boot flash device and for the
          NVRAM on the Momenco Ocelot board. If you have one of these boards


@@ -447,14 +462,6 @@ config MTD_DC21285
          21285 bridge used with Intel's StrongARM processors. More info at
          <http://www.intel.com/design/bridge/docs/21285_documentation.htm>.
 
          21285 bridge used with Intel's StrongARM processors. More info at
          <http://www.intel.com/design/bridge/docs/21285_documentation.htm>.
 

-config MTD_IQ80310
-       tristate "CFI Flash device mapped on the XScale IQ80310 board"
-       depends on MTD_CFI && ARCH_IQ80310
-       help
-         This enables access routines for the flash chips on the Intel XScale
-         IQ80310 evaluation board. If you have one of these boards and would
-         like to use the flash chips on it, say 'Y'.
-

 config MTD_IXP4XX
        tristate "CFI Flash device mapped on Intel IXP4xx based systems"
        depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX
 config MTD_IXP4XX
        tristate "CFI Flash device mapped on Intel IXP4xx based systems"
        depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX


@@ -542,7 +549,7 @@ config MTD_OMAP_NOR
 # This needs CFI or JEDEC, depending on the cards found.
 config MTD_PCI
        tristate "PCI MTD driver"
 # This needs CFI or JEDEC, depending on the cards found.
 config MTD_PCI
        tristate "PCI MTD driver"

-       depends on MTD && PCI && MTD_COMPLEX_MAPPINGS
+       depends on PCI && MTD_COMPLEX_MAPPINGS

        help
          Mapping for accessing flash devices on add-in cards like the Intel XScale
          IQ80310 card, and the Intel EBSA285 card in blank ROM programming mode
        help
          Mapping for accessing flash devices on add-in cards like the Intel XScale
          IQ80310 card, and the Intel EBSA285 card in blank ROM programming mode


@@ -552,7 +559,7 @@ config MTD_PCI
 
 config MTD_PCMCIA
        tristate "PCMCIA MTD driver"
 
 config MTD_PCMCIA
        tristate "PCMCIA MTD driver"

-       depends on MTD && PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN
+       depends on PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN

        help
          Map driver for accessing PCMCIA linear flash memory cards. These
          cards are usually around 4-16MiB in size. This does not include
        help
          Map driver for accessing PCMCIA linear flash memory cards. These
          cards are usually around 4-16MiB in size. This does not include


@@ -615,14 +622,13 @@ config MTD_BAST_MAXSIZE
        default "4"
 
 config MTD_SHARP_SL
        default "4"
 
 config MTD_SHARP_SL

-       bool "ROM maped on Sharp SL Series"
-       depends on MTD && ARCH_PXA
+       bool "ROM mapped on Sharp SL Series"
+       depends on ARCH_PXA

        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.
 
 config MTD_PLATRAM
        tristate "Map driver for platform device RAM (mtd-ram)"
        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.
 
 config MTD_PLATRAM
        tristate "Map driver for platform device RAM (mtd-ram)"

-       depends on MTD

        select MTD_RAM
        help
          Map driver for RAM areas described via the platform device
        select MTD_RAM
        help
          Map driver for RAM areas described via the platform device