mtd/drivers/mtd/maps Config.in, 1.69, 1.70 Kconfig, 1.38, 1.39 ebony.c, 1.14, 1.15

[Heikki O Lindholm]

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

Modified Files:
	Config.in Kconfig ebony.c 
Log Message:
Changed ebony to use JEDEC, since the factory config has JEDEC (AMD) parts. Enabled writing to BIOS area also. Change ok'd by the maintainer (Matt Porter).


Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Config.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Config.in	2 Sep 2004 01:27:07 -0000	1.69
+++ Config.in	9 Dec 2004 18:39:54 -0000	1.70
@@ -67,7 +67,7 @@
       dep_tristate '  CFI Flash device mapped on IBM Arctic' CONFIG_MTD_ARCTIC $CONFIG_MTD_CFI $CONFIG_ARCTIC2
     fi
     if [ "$CONFIG_440" = "y" ]; then
-      dep_tristate '  Flash devices mapped on IBM Ebony' CONFIG_MTD_EBONY $CONFIG_MTD_CFI $CONFIG_EBONY
+      dep_tristate '  Flash devices mapped on IBM Ebony' CONFIG_MTD_EBONY $CONFIG_MTD_JEDECPROBE $CONFIG_EBONY
     fi
   fi
 fi

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Kconfig,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Kconfig	24 Nov 2004 19:42:51 -0000	1.38
+++ Kconfig	9 Dec 2004 18:39:54 -0000	1.39
@@ -375,7 +375,7 @@
 
 config MTD_EBONY
 	tristate "Flash devices mapped on IBM 440GP Ebony"
-	depends on MTD_CFI && PPC32 && 44x && EBONY
+	depends on MTD_JEDECPROBE && PPC32 && 44x && EBONY
 	help
 	  This enables access routines for the flash chips on the IBM 440GP
 	  Ebony board. If you have one of these boards and would like to

Index: ebony.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ebony.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ebony.c	28 Nov 2004 09:40:39 -0000	1.14
+++ ebony.c	9 Dec 2004 18:39:54 -0000	1.15
@@ -103,7 +103,7 @@
 
 	simple_map_init(&ebony_small_map);
 
-	flash = do_map_probe("map_rom", &ebony_small_map);
+	flash = do_map_probe("jedec_probe", &ebony_small_map);
 	if (flash) {
 		flash->owner = THIS_MODULE;
 		add_mtd_partitions(flash, ebony_small_partitions,
@@ -124,7 +124,7 @@
 
 	simple_map_init(&ebony_large_map);
 
-	flash = do_map_probe("cfi_probe", &ebony_large_map);
+	flash = do_map_probe("jedec_probe", &ebony_large_map);
 	if (flash) {
 		flash->owner = THIS_MODULE;
 		add_mtd_partitions(flash, ebony_large_partitions,