Commit 938cfd03 authored by David Woodhouse's avatar David Woodhouse

M-Systems DiskOnChip driver update.

- Add Millennium Plus support.
- Add advanced probe configuration options
- Fix abuse of buffer space in scan for Media Header.
parent c3aa6326
# drivers/mtd/maps/Kconfig # drivers/mtd/maps/Kconfig
# $Id: Kconfig,v 1.10 2004/07/15 00:34:49 dwmw2 Exp $ # $Id: Kconfig,v 1.12 2004/08/10 13:12:18 dwmw2 Exp $
menu "Self-contained MTD device drivers" menu "Self-contained MTD device drivers"
depends on MTD!=n depends on MTD!=n
...@@ -128,7 +128,7 @@ config MTD_BLKMTD ...@@ -128,7 +128,7 @@ config MTD_BLKMTD
comment "Disk-On-Chip Device Drivers" comment "Disk-On-Chip Device Drivers"
config MTD_DOC2000 config MTD_DOC2000
tristate "M-Systems Disk-On-Chip 2000 and Millennium" tristate "M-Systems Disk-On-Chip 2000 and Millennium (DEPRECATED)"
depends on MTD depends on MTD
---help--- ---help---
This provides an MTD device driver for the M-Systems DiskOnChip This provides an MTD device driver for the M-Systems DiskOnChip
...@@ -144,8 +144,12 @@ config MTD_DOC2000 ...@@ -144,8 +144,12 @@ config MTD_DOC2000
emulate a block device by using a kind of file system on the flash emulate a block device by using a kind of file system on the flash
chips. chips.
NOTE: This driver is deprecated and will probably be removed soon.
Please try the new DiskOnChip driver under "NAND Flash Device
Drivers".
config MTD_DOC2001 config MTD_DOC2001
tristate "M-Systems Disk-On-Chip Millennium-only alternative driver (see help)" tristate "M-Systems Disk-On-Chip Millennium-only alternative driver (DEPRECATED)"
depends on MTD depends on MTD
---help--- ---help---
This provides an alternative MTD device driver for the M-Systems This provides an alternative MTD device driver for the M-Systems
...@@ -160,6 +164,10 @@ config MTD_DOC2001 ...@@ -160,6 +164,10 @@ config MTD_DOC2001
emulate a block device by using a kind of file system on the flash emulate a block device by using a kind of file system on the flash
chips. chips.
NOTE: This driver is deprecated and will probably be removed soon.
Please try the new DiskOnChip driver under "NAND Flash Device
Drivers".
config MTD_DOC2001PLUS config MTD_DOC2001PLUS
tristate "M-Systems Disk-On-Chip Millennium Plus" tristate "M-Systems Disk-On-Chip Millennium Plus"
depends on MTD depends on MTD
...@@ -172,19 +180,23 @@ config MTD_DOC2001PLUS ...@@ -172,19 +180,23 @@ config MTD_DOC2001PLUS
to emulate a block device by using a kind of file system on the to emulate a block device by using a kind of file system on the
flash chips. flash chips.
NOTE: This driver will soon be replaced by the new DiskOnChip driver
under "NAND Flash Device Drivers" (currently that driver does not
support all Millennium Plus devices).
config MTD_DOCPROBE config MTD_DOCPROBE
tristate tristate
default m if MTD_DOC2001!=y && MTD_DOC2000!=y && MTD_DOC2001PLUS!=y && (MTD_DOC2001=m || MTD_DOC2000=m || MTD_DOC2001PLUS=m) default m if MTD_DOC2001!=y && MTD_DOC2000!=y && MTD_DOC2001PLUS!=y && (MTD_DOC2001=m || MTD_DOC2000=m || MTD_DOC2001PLUS=m)
default y if MTD_DOC2001=y || MTD_DOC2000=y || MTD_DOC2001PLUS=y default y if MTD_DOC2001=y || MTD_DOC2000=y || MTD_DOC2001PLUS=y
help help
This isn't a real config option, it's derived. This isn't a real config option; it's derived.
config MTD_DOCECC config MTD_DOCECC
tristate tristate
default m if MTD_DOCPROBE!=y && MTD_NAND_DISKONCHIP!=y && (MTD_DOCPROBE=m || MTD_NAND_DISKONCHIP=m) default m if MTD_DOCPROBE!=y && MTD_NAND_DISKONCHIP!=y && (MTD_DOCPROBE=m || MTD_NAND_DISKONCHIP=m)
default y if MTD_DOCPROBE=y || MTD_NAND_DISKONCHIP=y default y if MTD_DOCPROBE=y || MTD_NAND_DISKONCHIP=y
help help
This isn't a real config option, it's derived. This isn't a real config option; it's derived.
config MTD_DOCPROBE_ADVANCED config MTD_DOCPROBE_ADVANCED
bool "Advanced detection options for DiskOnChip" bool "Advanced detection options for DiskOnChip"
......
# drivers/mtd/nand/Kconfig # drivers/mtd/nand/Kconfig
# $Id: Kconfig,v 1.14 2004/07/13 00:14:35 dbrown Exp $ # $Id: Kconfig,v 1.17 2004/08/10 14:24:07 dwmw2 Exp $
menu "NAND Flash Device Drivers" menu "NAND Flash Device Drivers"
depends on MTD!=n depends on MTD!=n
...@@ -81,15 +81,51 @@ config MTD_NAND_PPCHAMELEONEVB ...@@ -81,15 +81,51 @@ config MTD_NAND_PPCHAMELEONEVB
This enables the NAND flash driver on the PPChameleon EVB Board. This enables the NAND flash driver on the PPChameleon EVB Board.
config MTD_NAND_DISKONCHIP config MTD_NAND_DISKONCHIP
tristate "DiskOnChip 2000 and Millennium (NAND reimplementation) (EXPERIMENTAL)" tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
depends on MTD_NAND && EXPERIMENTAL depends on MTD_NAND && EXPERIMENTAL
help help
This is a reimplementation of M-Systems DiskOnChip 2000 and This is a reimplementation of M-Systems DiskOnChip 2000,
Millennium as a standard NAND device driver, as opposed to the Millennium and Millennium Plus as a standard NAND device driver,
earlier self-contained MTD device drivers. as opposed to the earlier self-contained MTD device drivers.
This should enable, among other things, proper JFFS2 operation on This should enable, among other things, proper JFFS2 operation on
these devices. these devices.
config MTD_NAND_DISKONCHIP_PROBE_ADVANCED
bool "Advanced detection options for DiskOnChip"
depends on MTD_NAND_DISKONCHIP
help
This option allows you to specify nonstandard address at which to
probe for a DiskOnChip, or to change the detection options. You
are unlikely to need any of this unless you are using LinuxBIOS.
Say 'N'.
config MTD_NAND_DISKONCHIP_PROBE_ADDRESS
hex "Physical address of DiskOnChip" if MTD_NAND_DISKONCHIP_PROBE_ADVANCED
depends on MTD_NAND_DISKONCHIP
default "0"
---help---
By default, the probe for DiskOnChip devices will look for a
DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
This option allows you to specify a single address at which to probe
for the device, which is useful if you have other devices in that
range which get upset when they are probed.
(Note that on PowerPC, the normal probe will only check at
0xE4000000.)
Normally, you should leave this set to zero, to allow the probe at
the normal addresses.
config MTD_NAND_DISKONCHIP_PROBE_HIGH
bool "Probe high addresses"
depends on MTD_NAND_DISKONCHIP_PROBE_ADVANCED
help
By default, the probe for DiskOnChip devices will look for a
DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
This option changes to make it probe between 0xFFFC8000 and
0xFFFEE000. Unless you are using LinuxBIOS, this is unlikely to be
useful to you. Say 'N'.
config MTD_NAND_DISKONCHIP_BBTWRITE config MTD_NAND_DISKONCHIP_BBTWRITE
bool "Allow BBT writes on DiskOnChip Millennium and 2000TSOP" bool "Allow BBT writes on DiskOnChip Millennium and 2000TSOP"
depends on MTD_NAND_DISKONCHIP depends on MTD_NAND_DISKONCHIP
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment