linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 64d1b6a..7abd7fe 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -13,13 +13,13 @@ config MTD_COMPLEX_MAPPINGS
 
 config MTD_PHYSMAP
        tristate "CFI Flash device in physical memory map"
 
 config MTD_PHYSMAP
        tristate "CFI Flash device in physical memory map"

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

        help
        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. 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 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

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


@@ -37,7 +37,7 @@ config MTD_PHYSMAP_START
 config MTD_PHYSMAP_LEN
        hex "Physical length of flash mapping"
        depends on MTD_PHYSMAP
 config MTD_PHYSMAP_LEN
        hex "Physical length of flash mapping"
        depends on MTD_PHYSMAP

-       default "0"
+       default "0x4000000"

        help
          This is the total length of the mapping of the flash chips on
          your particular board. If there is space, or aliases, in the
        help
          This is the total length of the mapping of the flash chips on
          your particular board. If there is space, or aliases, in the


@@ -78,7 +78,7 @@ config MTD_PNC2000
 
 config MTD_SC520CDP
        tristate "CFI Flash device mapped on AMD SC520 CDP"
 
 config MTD_SC520CDP
        tristate "CFI Flash device mapped on AMD SC520 CDP"

-       depends on X86 && MTD_CFI && MTD_CONCAT
+       depends on X86 && MTD_CFI

        help
          The SC520 CDP board has two banks of CFI-compliant chips and one
          Dual-in-line JEDEC chip. This 'mapping' driver supports that
        help
          The SC520 CDP board has two banks of CFI-compliant chips and one
          Dual-in-line JEDEC chip. This 'mapping' driver supports that


@@ -109,7 +109,7 @@ config MTD_TS5500
          mtd1 allows you to reprogram your BIOS. BE VERY CAREFUL.
 
          Note that jumper 3 ("Write Enable Drive A") must be set
          mtd1 allows you to reprogram your BIOS. BE VERY CAREFUL.
 
          Note that jumper 3 ("Write Enable Drive A") must be set

-         otherwise detection won't succeed.
+         otherwise detection won't succeeed.

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


@@ -200,8 +200,8 @@ config MTD_TSUNAMI
          Support for the flash chip on Tsunami TIG bus.
 
 config MTD_LASAT
          Support for the flash chip on Tsunami TIG bus.
 
 config MTD_LASAT

-       tristate "LASAT flash device"
-       depends on LASAT && MTD_CFI
+       tristate "Flash chips on LASAT board"
+       depends on LASAT

        help
          Support for the flash chips on the Lasat 100 and 200 boards.
 
        help
          Support for the flash chips on the Lasat 100 and 200 boards.
 


@@ -212,7 +212,7 @@ config MTD_NETtel
          Support for flash chips on NETtel/SecureEdge/SnapGear boards.
 
 config MTD_ALCHEMY
          Support for flash chips on NETtel/SecureEdge/SnapGear boards.
 
 config MTD_ALCHEMY

-       tristate "AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support"
+       tristate '  AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support'

        depends on SOC_AU1X00
        help
          Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
        depends on SOC_AU1X00
        help
          Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards


@@ -561,6 +561,7 @@ config MTD_PCMCIA
 config MTD_PCMCIA_ANONYMOUS
        bool "Use PCMCIA MTD drivers for anonymous PCMCIA cards"
        depends on MTD_PCMCIA
 config MTD_PCMCIA_ANONYMOUS
        bool "Use PCMCIA MTD drivers for anonymous PCMCIA cards"
        depends on MTD_PCMCIA

+       default N

        help
          If this option is enabled, PCMCIA cards which do not report
          anything about themselves are assumed to be MTD cards.
        help
          If this option is enabled, PCMCIA cards which do not report
          anything about themselves are assumed to be MTD cards.