--- zzzz-none-000/linux-2.4.17/drivers/mtd/maps/Config.in	2001-10-04 22:13:18.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/mtd/maps/Config.in	2004-11-24 13:22:49.000000000 +0000
@@ -1,6 +1,6 @@
 # drivers/mtd/maps/Config.in
 
-# $Id: Config.in,v 1.16 2001/09/19 18:28:37 dwmw2 Exp $
+# $Id: Config.in,v 1.8 2002/10/10 18:07:46 jyothi Exp $
 
 mainmenu_option next_comment
 
@@ -13,6 +13,13 @@
    int '    Bus width in octets' CONFIG_MTD_PHYSMAP_BUSWIDTH 2
 fi
 
+dep_tristate '  Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS 
+if [ "$CONFIG_MTD_CSTM_MIPS_IXX" != "n" ]; then
+   hex '    Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
+   hex '    Physical length of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_LEN 0x4000000
+   int '    Bus width in octets' CONFIG_MTD_CSTM_MIPS_IXX_BUSWIDTH 2
+fi
+
 if [ "$CONFIG_SPARC" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
    dep_tristate '  Sun Microsystems userflash support' CONFIG_MTD_SUN_UFLASH $CONFIG_MTD_CFI
 fi
@@ -26,28 +33,99 @@
    dep_tristate '  JEDEC Flash device mapped on Mixcom piggyback card' CONFIG_MTD_MIXMEM $CONFIG_MTD_JEDEC
    dep_tristate '  JEDEC Flash device mapped on Octagon 5066 SBC' CONFIG_MTD_OCTAGON $CONFIG_MTD_JEDEC
    dep_tristate '  JEDEC Flash device mapped on Tempustech VMAX SBC301' CONFIG_MTD_VMAX $CONFIG_MTD_JEDEC
-   dep_tristate '  BIOS flash chip on Intel L440GX boards' CONFIG_MTD_L440GX $CONFIG_I386 $CONFIG_MTD_JEDEC
+   dep_tristate '  BIOS flash chip on Intel L440GX boards' CONFIG_MTD_L440GX $CONFIG_X86 $CONFIG_MTD_JEDEC
 fi
 
 if [ "$CONFIG_PPC" = "y" ]; then
-   dep_tristate '  CFI Flash device mapped on TQM8XXL' CONFIG_MTD_TQM8XXL $CONFIG_MTD_CFI $CONFIG_TQM8xxL $CONFIG_PPC
-   dep_tristate '  CFI Flash device mapped on RPX Lite or CLLF' CONFIG_MTD_RPXLITE $CONFIG_MTD_CFI $CONFIG_PPC
-   dep_tristate '  CFI Flash device mapped on D-Box2' CONFIG_MTD_DBOX2 $CONFIG_MTD_CFI_INTELSTD $CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_CFI_AMDSTD
+   dep_tristate '  CFI Flash device mapped on TQM8XXL' CONFIG_MTD_TQM8XXL $CONFIG_MTD_CFI $CONFIG_TQM8xxL
+   dep_tristate '  CFI Flash device mapped on RPX Lite or CLLF' CONFIG_MTD_RPXLITE $CONFIG_MTD_CFI
+   dep_tristate '  System flash on MBX860 board' CONFIG_MTD_MBX860 $CONFIG_MTD_CFI
+   dep_tristate '  CFI Flash device mapped on IBM Redwood-4' CONFIG_MTD_REDWOOD_4 $CONFIG_MTD_CFI
+   dep_tristate '  CFI Flash device mapped on D-Box2' CONFIG_MTD_DBOX2 $CONFIG_MTD_CFI
    dep_tristate '  CFI Flash device mapping on FlagaDM' CONFIG_MTD_CFI_FLAGADM $CONFIG_MTD_CFI
+   dep_tristate '  CFI Flash device mapped on PowerPlus' CONFIG_MTD_POWERPLUS $CONFIG_MTD_CFI $CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_PARTITIONS
 fi
 
 if [ "$CONFIG_MIPS" = "y" ]; then
-   dep_tristate '  Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS 
-   if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
-      hex '    Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
-      hex '    Physical length of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_LEN 0x4000000
-      int '    Bus width in octets' CONFIG_MTD_CSTM_MIPS_IXX_BUSWIDTH 2
+   if [ "$CONFIG_MIPS_AVALANCHE_SOC" = "y" ]; then
+      dep_tristate '  CFI Flash device mapped on Avalanche board' CONFIG_MTD_AVALANCHE $CONFIG_MTD_CFI $CONFIG_MTD_PARTITIONS
+      dep_bool     '    Use defaults for Avalanche reference platforms' CONFIG_MTD_AVALANCHE_DEFAULTS $CONFIG_MTD_AVALANCHE
+      if [ "$CONFIG_MTD_AVALANCHE" = "y" -o "$CONFIG_MTD_AVALANCHE" = "m" ]; then
+         if [ "$CONFIG_MTD_AVALANCHE_DEFAULTS" = "y" ]; then
+            if [ "$CONFIG_MIPS_AVALANCHE_EVM3" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x1000000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 4
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+            if [ "$CONFIG_MIPS_WA1130" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x200000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 2
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+            if [ "$CONFIG_MIPS_AR7DB" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x400000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 2
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+            if [ "$CONFIG_MIPS_AR7RD" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x400000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 2
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+
+            if [ "$CONFIG_MIPS_AR7WI" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x400000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 2
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+
+            if [ "$CONFIG_MIPS_AR7V" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x400000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 2
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+
+	    if [ "$CONFIG_MIPS_AR7WRD" = "y" -o "$CONFIG_MIPS_AR7VWI" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x400000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 2
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+            if [ "$CONFIG_MIPS_TNETV1050SDB" = "y" ]; then
+               define_hex CONFIG_MTD_AVALANCHE_START 0x10000000
+               define_hex CONFIG_MTD_AVALANCHE_LEN 0x800000
+               define_int CONFIG_MTD_AVALANCHE_BUSWIDTH 4
+               define int CONFIG_MTD_AVALANCHE_PARTITIONS 5
+            fi
+	 else
+            hex '      Physical start address of flash mapping' CONFIG_MTD_AVALANCHE_START 0x10000000
+            hex '      Physical length of flash mapping' CONFIG_MTD_AVALANCHE_LEN 0x200000
+            int '      Bus width in octets' CONFIG_MTD_AVALANCHE_BUSWIDTH 2
+            int '      Supported mtd partitions' CONFIG_MTD_AVALANCHE_PARTITIONS 5
+	 fi
+      fi
+   fi
+   dep_tristate '  Pb1000 boot flash device' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
+   dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
+   if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" ]; then
+      bool '  Pb1500 boot flash device' CONFIG_MTD_PB1500_BOOT 
+      bool '  Pb1500 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
    fi
    dep_tristate '  Momenco Ocelot boot flash device' CONFIG_MTD_OCELOT $CONFIG_MOMENCO_OCELOT
 fi
 
-if [ "$CONFIG_SH" = "y" ]; then
-   dep_tristate '  CFI Flash device mapped on Hitachi SolutionEngine' CONFIG_MTD_SOLUTIONENGINE $CONFIG_MTD_CFI $CONFIG_SH $CONFIG_MTD_REDBOOT_PARTS
+if [ "$CONFIG_SUPERH" = "y" ]; then
+   dep_tristate '  CFI Flash device mapped on Hitachi SolutionEngine' \
+      CONFIG_MTD_SOLUTIONENGINE $CONFIG_MTD_PARTITIONS $CONFIG_MTD_CFI
+   if [ "$CONFIG_MTD_SOLUTIONENGINE" != "n" ]; then
+      hex '  Default reserved Flash size'  CONFIG_MTD_SUPERH_RESERVE 0x00010000
+   fi
 fi
 
 if [ "$CONFIG_ARM" = "y" ]; then
@@ -57,6 +135,11 @@
    dep_tristate '  CFI Flash device mapped on StrongARM SA11x0' CONFIG_MTD_SA1100 $CONFIG_MTD_CFI $CONFIG_ARCH_SA1100 $CONFIG_MTD_PARTITIONS
    dep_tristate '  CFI Flash device mapped on DC21285 Footbridge' CONFIG_MTD_DC21285 $CONFIG_MTD_CFI $CONFIG_ARCH_FOOTBRIDGE $CONFIG_MTD_PARTITIONS
    dep_tristate '  CFI Flash device mapped on the XScale IQ80310 board' CONFIG_MTD_IQ80310 $CONFIG_MTD_CFI $CONFIG_ARCH_IQ80310
+   dep_tristate '  CFI Flash device mapped on Epxa10db' CONFIG_MTD_EPXA10DB $CONFIG_MTD_CFI  $CONFIG_MTD_PARTITIONS $CONFIG_ARCH_CAMELOT
+   dep_tristate '  CFI Flash device mapped on Lubbock board' CONFIG_MTD_LUBBOCK $CONFIG_MTD_CFI $CONFIG_ARCH_LUBBOCK $CONFIG_MTD_PARTITIONS
 fi
 
+# This needs CFI or JEDEC, depending on the cards found.
+dep_tristate '  PCI MTD driver' CONFIG_MTD_PCI $CONFIG_MTD $CONFIG_PCI
+
 endmenu