mtd/drivers/mtd/maps alchemy-flash.c, NONE, 1.1 Config.in, 1.71, 1.72 Kconfig, 1.44, 1.45 Makefile.common, 1.24, 1.25 db1550-flash.c, 1.7, NONE db1x00-flash.c, 1.6, NONE pb1550-flash.c, 1.6, NONE pb1xxx-flash.c, 1.14, NONE

Sun Feb 27 16:50:25 EST 2005

Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv9532/drivers/mtd/maps

Modified Files:
	Config.in Kconfig Makefile.common 
Added Files:
	alchemy-flash.c 
Removed Files:
	db1550-flash.c db1x00-flash.c pb1550-flash.c pb1xxx-flash.c 
Log Message:
Replaced all the Au1x mapping drivers with a simplified single driver.
This driver does not have as many options but it's easier to maintain.
And, it turns out AMD never shipped boards with different flash densities.


***** Error reading new file: [Errno 2] No such file or directory: 'alchemy-flash.c'
Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Config.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72

--- Config.in	9 Dec 2004 20:01:05 -0000	1.71
+++ Config.in	27 Feb 2005 21:50:21 -0000	1.72
@@ -74,33 +74,7 @@
 fi
 
 if [ "$CONFIG_MIPS" = "y" -o "$CONFIG_MIPS64" = "y" ]; then
-   if [ "$CONFIG_MIPS_PB1000" = "y" -o "$CONFIG_MIPS_PB1100" = "y" -o "$CONFIG_MIPS_PB1500" = "y" ]; then
-      tristate '  Pb1x00 MTD support' CONFIG_MTD_PB1XXX
-   fi
-   if [ "$CONFIG_MTD_PB1XXX" = "y" -o "$CONFIG_MTD_PB1XXX" = "m" ]; then
-      if [ "$CONFIG_MIPS_PB1500" = "y" -o "$CONFIG_MIPS_PB1100" = "y" ]; then
-         bool '  Pb1[15]00 boot flash device' CONFIG_MTD_PB1500_BOOT 
-         bool '  Pb1[15]00 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
-      fi
-   fi
-   if [ "$CONFIG_MIPS_DB1000" = "y" -o "$CONFIG_MIPS_DB1100" = "y" -o "$CONFIG_MIPS_DB1500" = "y" ]; then
-      tristate '  Db1x00 MTD support' CONFIG_MTD_DB1X00
-      if [ "$CONFIG_MTD_DB1X00" = "y" -o "$CONFIG_MTD_DB1X00" = "m" ]; then
-         bool '    Db1x00 boot flash device (1st bank)' CONFIG_MTD_DB1X00_BOOT
-         bool '    Db1x00 user flash device (2nd bank)' CONFIG_MTD_DB1X00_USER
-      fi
-   fi
-   dep_tristate '  Pb1550 MTD support' CONFIG_MTD_PB1550 $CONFIG_MIPS_PB1550
-   dep_tristate '  Db1550 MTD support' CONFIG_MTD_DB1550 $CONFIG_MIPS_DB1550
-   dep_tristate '  XXS1500 boot flash device' CONFIG_MTD_XXS1500 $CONFIG_MIPS_XXS1500
-   if [ "$CONFIG_MTD_PB1550" = "y" -o "$CONFIG_MTD_PB1550" = "m" ]; then
-      bool '  Pb1550 Boot Flash' CONFIG_MTD_PB1550_BOOT
-      bool '  Pb1550 User Parameter Flash' CONFIG_MTD_PB1550_USER
-   fi
-   if [ "$CONFIG_MTD_DB1550" = "y" -o "$CONFIG_MTD_DB1550" = "m" ]; then
-      bool '  Db1550 Boot Flash' CONFIG_MTD_DB1550_BOOT
-      bool '  Db1550 User Parameter Flash' CONFIG_MTD_DB1550_USER
-   fi
+   dep_tristate '  AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support' CONFIG_MTD_ALCHEMY $CONFIG_SOC_AU1X00
    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

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Kconfig,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Kconfig	18 Feb 2005 11:03:45 -0000	1.44
+++ Kconfig	27 Feb 2005 21:50:21 -0000	1.45
@@ -213,74 +213,11 @@
 	help
 	  Support for flash chips on NETtel/SecureEdge/SnapGear boards.
 
-config MTD_PB1XXX
-	tristate "Flash devices on Alchemy PB1xxx boards"
-	depends on MIPS && ( MIPS_PB1000 || MIPS_PB1100 || MIPS_PB1500 )
-	help
-	  Flash memory access on Alchemy Pb1000/Pb1100/Pb1500 boards
-
-config MTD_PB1XXX_BOOT
-	bool "PB1x00 boot flash device"
-	depends on MTD_PB1XXX && ( MIPS_PB1100 || MIPS_PB1500 )
-	help
-	  Use the first of the two 32MiB flash banks on Pb1100/Pb1500 board.
-	  You can say 'Y' to both this and 'MTD_PB1XXX_USER' below, to use
-	  both banks.
-
-config MTD_PB1XXX_USER
-	bool "PB1x00 user flash device"
-	depends on MTD_PB1XXX && ( MIPS_PB1100 || MIPS_PB1500 )
-	default y if MTD_PB1XX_BOOT = n
-	help
-	  Use the second of the two 32MiB flash banks on Pb1100/Pb1500 board.
-	  You can say 'Y' to both this and 'MTD_PB1XXX_BOOT' above, to use
-	  both banks.
-
-config MTD_PB1550
-	tristate "Flash devices on Alchemy PB1550 board"
-	depends on MIPS && MIPS_PB1550
-	help
-	  Flash memory access on Alchemy Pb1550 board
-
-config MTD_PB1550_BOOT
-	bool "PB1550 boot flash device"
-	depends on MTD_PB1550
-	help
-	  Use the first of the two 64MiB flash banks on Pb1550 board.
-	  You can say 'Y' to both this and 'MTD_PB1550_USER' below, to use
-	  both banks.
-
-config MTD_PB1550_USER
-	bool "PB1550 user flash device"
-	depends on MTD_PB1550
-	default y if MTD_PB1550_BOOT = n
-	help
-	  Use the second of the two 64MiB flash banks on Pb1550 board.
-	  You can say 'Y' to both this and 'MTD_PB1550_BOOT' above, to use
-	  both banks.
-
-config MTD_DB1550
-	tristate "Flash devices on Alchemy DB1550 board"
-	depends on MIPS && MIPS_DB1550
-	help
-	  Flash memory access on Alchemy Db1550 board
-
-config MTD_DB1550_BOOT
-	bool "DB1550 boot flash device"
-	depends on MTD_DB1550
-	help
-	  Use the first of the two 64MiB flash banks on Db1550 board.
-	  You can say 'Y' to both this and 'MTD_DB1550_USER' below, to use
-	  both banks.
-
-config MTD_DB1550_USER
-	bool "DB1550 user flash device"
-	depends on MTD_DB1550
-	default y if MTD_DB1550_BOOT = n
-	help
-	  Use the second of the two 64MiB flash banks on Db1550 board.
-	  You can say 'Y' to both this and 'MTD_DB1550_BOOT' above, to use
-	  both banks.
+config MTD_ALCHEMY
+	tristate '  AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support' 
+	depends on MIPS && SOC_AU1X00
+	help
+	  Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
 
 config MTD_DILNETPC
 	tristate "CFI Flash device mapped on DIL/Net PC"

Index: Makefile.common
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Makefile.common,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.common	24 Jan 2005 00:35:21 -0000	1.24
+++ Makefile.common	27 Feb 2005 21:50:21 -0000	1.25
@@ -44,10 +44,7 @@
 obj-$(CONFIG_MTD_OCELOT)	+= ocelot.o
 obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
 obj-$(CONFIG_MTD_PCI)		+= pci.o
-obj-$(CONFIG_MTD_PB1XXX)	+= pb1xxx-flash.o
-obj-$(CONFIG_MTD_DB1X00)        += db1x00-flash.o
-obj-$(CONFIG_MTD_PB1550)        += pb1550-flash.o
-obj-$(CONFIG_MTD_DB1550)        += db1550-flash.o
+obj-$(CONFIG_MTD_ALCHEMY)       += alchemy-flash.o
 obj-$(CONFIG_MTD_LASAT)		+= lasat.o
 obj-$(CONFIG_MTD_AUTCPU12)	+= autcpu12-nvram.o
 obj-$(CONFIG_MTD_EDB7312)	+= edb7312.o
@@ -72,4 +69,4 @@
 obj-$(CONFIG_MTD_WRSBC8260)	+= wr_sbc82xx_flash.o
 obj-$(CONFIG_MTD_DMV182)	+= dmv182.o
 obj-$(CONFIG_MTD_SHARP_SL)	+= sharpsl-flash.o
-obj-$(CONFIG_MTD_PLATRAM)	+= plat-ram.o
\ No newline at end of file
+obj-$(CONFIG_MTD_PLATRAM)	+= plat-ram.o

--- db1550-flash.c DELETED ---

--- db1x00-flash.c DELETED ---

--- pb1550-flash.c DELETED ---

--- pb1xxx-flash.c DELETED ---



