diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 23:30:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 23:30:56 -0400 |
commit | 9ee08c2df47c10ba624ff05a6c0f2500748bcb69 (patch) | |
tree | 0a2788abb3b5547b83965e0b3132eec8b196bd81 /drivers/mtd/maps/Kconfig | |
parent | eaf0ba5ef69538b6913525294a3a0fcb0e0992e0 (diff) | |
parent | 3d45955962496879dead8d4dd70bb9a23b07154b (diff) |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (57 commits)
[MTD] [NAND] subpage read feature as a way to increase performance.
CPUFREQ: S3C24XX NAND driver frequency scaling support.
[MTD][NAND] au1550nd: remove unused variable
[MTD] jedec_probe: Fix SST 16-bit chip detection
[MTD][MTDPART] Fix a division by zero bug
[MTD][MTDPART] Cleanup and document the erase region handling
[MTD][MTDPART] Handle most checkpatch findings
[MTD][MTDPART] Seperate main loop from per-partition code in add_mtd_partition
[MTD] physmap: resume already suspended chips on failure to suspend
[MTD] physmap: Fix suspend/resume/shutdown bugs.
[MTD] [NOR] Fix -ETIMEO errors in CFI driver
[MTD] [NAND] fsl_elbc_nand: fix section mismatch with CONFIG_MTD_OF_PARTS=y
[JFFS2] Use .unlocked_ioctl
[MTD] Fix const assignment in the MTD command line partitioning driver
[MTD] [NOR] gen_probe: No debug message when debugging is disabled
[MTD] [NAND] remove __PPC__ hardcoded address from DiskOnChip drivers
[MTD] [MAPS] Remove the bast-flash driver.
[MTD] [NAND] fsl_elbc_nand: ecclayout cleanups
[MTD] [NAND] fsl_elbc_nand: implement support for flash-based BBT
[MTD] [NAND] fsl_elbc_nand: fix OOB workability for large page NAND chips
...
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
-rw-r--r-- | drivers/mtd/maps/Kconfig | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index d2fbc2964523..df8e00bba07b 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -1,5 +1,4 @@ | |||
1 | # drivers/mtd/maps/Kconfig | 1 | # drivers/mtd/maps/Kconfig |
2 | # $Id: Kconfig,v 1.61 2005/11/07 11:14:26 gleixner Exp $ | ||
3 | 2 | ||
4 | menu "Mapping drivers for chip access" | 3 | menu "Mapping drivers for chip access" |
5 | depends on MTD!=n | 4 | depends on MTD!=n |
@@ -510,6 +509,17 @@ config MTD_PCMCIA_ANONYMOUS | |||
510 | 509 | ||
511 | If unsure, say N. | 510 | If unsure, say N. |
512 | 511 | ||
512 | config MTD_BFIN_ASYNC | ||
513 | tristate "Blackfin BF533-STAMP Flash Chip Support" | ||
514 | depends on BFIN533_STAMP && MTD_CFI | ||
515 | select MTD_PARTITIONS | ||
516 | default y | ||
517 | help | ||
518 | Map driver which allows for simultaneous utilization of | ||
519 | ethernet and CFI parallel flash. | ||
520 | |||
521 | If compiled as a module, it will be called bfin-async-flash. | ||
522 | |||
513 | config MTD_UCLINUX | 523 | config MTD_UCLINUX |
514 | tristate "Generic uClinux RAM/ROM filesystem support" | 524 | tristate "Generic uClinux RAM/ROM filesystem support" |
515 | depends on MTD_PARTITIONS && !MMU | 525 | depends on MTD_PARTITIONS && !MMU |
@@ -539,24 +549,6 @@ config MTD_DMV182 | |||
539 | help | 549 | help |
540 | Map driver for Dy-4 SVME/DMV-182 board. | 550 | Map driver for Dy-4 SVME/DMV-182 board. |
541 | 551 | ||
542 | config MTD_BAST | ||
543 | tristate "Map driver for Simtec BAST (EB2410ITX) or Thorcom VR1000" | ||
544 | depends on ARCH_BAST || MACH_VR1000 | ||
545 | select MTD_PARTITIONS | ||
546 | select MTD_MAP_BANK_WIDTH_16 | ||
547 | select MTD_JEDECPROBE | ||
548 | help | ||
549 | Map driver for NOR flash on the Simtec BAST (EB2410ITX), or the | ||
550 | Thorcom VR1000 | ||
551 | |||
552 | Note, this driver *cannot* over-ride the WP link on the | ||
553 | board, or currently detect the state of the link. | ||
554 | |||
555 | config MTD_BAST_MAXSIZE | ||
556 | int "Maximum size for BAST flash area (MiB)" | ||
557 | depends on MTD_BAST | ||
558 | default "4" | ||
559 | |||
560 | config MTD_SHARP_SL | 552 | config MTD_SHARP_SL |
561 | tristate "ROM mapped on Sharp SL Series" | 553 | tristate "ROM mapped on Sharp SL Series" |
562 | depends on ARCH_PXA | 554 | depends on ARCH_PXA |