Resync with generic-2.6 config-template

[openwrt.git] / target / linux / rdc-2.6 / patches / 001-rdc3210_flash_map.patch

diff --git a/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch b/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch
index f69fbf8..0c407a1 100644 (file)
--- a/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch
+++ b/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch
@@ -1,19 +1,57 @@
 diff -urN linux-2.6.17/drivers/mtd/maps/Kconfig linux-2.6.17.new/drivers/mtd/maps/Kconfig
 --- linux-2.6.17/drivers/mtd/maps/Kconfig      2006-06-18 03:49:35.000000000 +0200
 +++ linux-2.6.17.new/drivers/mtd/maps/Kconfig  2006-09-24 20:28:11.000000000 +0200
 diff -urN linux-2.6.17/drivers/mtd/maps/Kconfig linux-2.6.17.new/drivers/mtd/maps/Kconfig
 --- linux-2.6.17/drivers/mtd/maps/Kconfig      2006-06-18 03:49:35.000000000 +0200
 +++ linux-2.6.17.new/drivers/mtd/maps/Kconfig  2006-09-24 20:28:11.000000000 +0200

-@@ -76,6 +76,12 @@
+@@ -76,6 +76,50 @@

          PNC-2000 is the name of Network Camera product from PHOTRON
          Ltd. in Japan. It uses CFI-compliant flash.
  
 +config MTD_RDC3210
          PNC-2000 is the name of Network Camera product from PHOTRON
          Ltd. in Japan. It uses CFI-compliant flash.
  
 +config MTD_RDC3210

-+      tristate "CFI Flash devcie mapped on RDC3210"
++      tristate "CFI Flash device mapped on RDC3210"

 +      depends on X86 && MTD_CFI && MTD_PARTITIONS
 +      help
 +      depends on X86 && MTD_CFI && MTD_PARTITIONS
 +      help

-+        RDC-3210 is the flash device we find on Ralink reference board
++        RDC-3210 is the flash device we find on Ralink reference board.
++
++config MTD_RDC3210_STATIC_MAP
++      bool "Partitions on RDC3210 mapped statically" if MTD_RDC3210
++      select MTD_RDC3210_FACTORY_PRESENT
++      help
++        The mapping driver will use the static partition map for the
++        RDC-3210 flash device.
++
++config MTD_RDC3210_FACTORY_PRESENT
++      bool "Reserve a partition on RDC3210 for factory presets"
++      depends on MTD_RDC3210
++      default y
++      help
++        The mapping driver will reserve a partition on the RDC-3210 flash
++        device for resetting flash contents to factory defaults.
++
++config MTD_RDC3210_ALLOW_JFFS2
++      bool "JFFS2 filesystem usable in a partition on RDC3210"
++      depends on MTD_RDC3210 && !MTD_RDC3210_STATIC_MAP
++      help
++        The mapping driver will align a partition on the RDC-3210 flash
++        device to an erase-block boundary so that a JFFS2 filesystem may
++        reside on it.
++
++config MTD_RDC3210_SIZE
++      hex "Amount of flash memory on RDC3210"
++      depends on MTD_RDC3210
++      default "0x400000"
++      help
++        Total size in bytes of the RDC-3210 flash device
++
++config MTD_RDC3210_BUSWIDTH
++      int "Width of CFI Flash device mapped on RDC3210"
++      depends on MTD_RDC3210
++      default "2"
++      help
++        Number of bytes addressed on the RDC-3210 flash device before
++        addressing the same chip again

 +
  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
+       depends on X86 && MTD_CFI && MTD_CONCAT

 diff -urN linux-2.6.17/drivers/mtd/maps/Makefile linux-2.6.17.new/drivers/mtd/maps/Makefile
 --- linux-2.6.17/drivers/mtd/maps/Makefile     2006-06-18 03:49:35.000000000 +0200
 +++ linux-2.6.17.new/drivers/mtd/maps/Makefile 2006-09-24 20:26:10.000000000 +0200
 diff -urN linux-2.6.17/drivers/mtd/maps/Makefile linux-2.6.17.new/drivers/mtd/maps/Makefile
 --- linux-2.6.17/drivers/mtd/maps/Makefile     2006-06-18 03:49:35.000000000 +0200
 +++ linux-2.6.17.new/drivers/mtd/maps/Makefile 2006-09-24 20:26:10.000000000 +0200