mtd/drivers/mtd/maps arctic-mtd.c,1.3,1.4

[trini at infradead.org]

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

Modified Files:
	arctic-mtd.c 
Log Message:
Update the map for the IBM Arctic II so that the kernel and
firmware are on separate partitions.  From Todd Poynor <tpoynor at mvista.com>


Index: arctic-mtd.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/arctic-mtd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- arctic-mtd.c	31 Jan 2003 08:27:38 -0000	1.3
+++ arctic-mtd.c	2 Apr 2003 18:57:15 -0000	1.4
@@ -43,7 +43,14 @@
 #include <asm/io.h>
 #include <asm/ibm4xx.h>
 
-#define ARCTIC_FFS_SIZE	0x1a00000 /* 26 M */
+/*
+ * fe000000 -- ff9fffff  Arctic FFS (26MB)
+ * ffa00000 -- fff5ffff  kernel (5.504MB)
+ * fff60000 -- ffffffff  firmware (640KB)
+ */
+
+#define ARCTIC_FFS_SIZE		0x01a00000 /* 26 M */
+#define ARCTIC_FIRMWARE_SIZE	0x000a0000 /* 640K */
 
 #define NAME     "Arctic Linux Flash"
 #define PADDR    SUBZERO_BOOTFLASH_PADDR
@@ -132,13 +139,17 @@
 
 static struct mtd_info *arctic_mtd;
 
-static struct mtd_partition arctic_partitions[2] = {
+static struct mtd_partition arctic_partitions[3] = {
 	{ .name		= "Arctic FFS",
 	  .size		= ARCTIC_FFS_SIZE,
 	  .offset	= 0,},
-	{ .name		= "Kernel & firmware",
-	  .size		= (SUBZERO_BOOTFLASH_SIZE - ARCTIC_FFS_SIZE),
+	{ .name		= "Kernel",
+	  .size		= SUBZERO_BOOTFLASH_SIZE - ARCTIC_FFS_SIZE -
+	  		  ARCTIC_FIRMWARE_SIZE,
 	  .offset	= ARCTIC_FFS_SIZE,},
+	{ .name		= "Firmware",
+	  .size		= ARCTIC_FIRMWARE_SIZE,
+	  .offset	= SUBZERO_BOOTFLASH_SIZE - ARCTIC_FIRMWARE_SIZE,},
 };
 
 static int __init
@@ -161,7 +172,7 @@
 
 	arctic_mtd->module = THIS_MODULE;
 
-	return add_mtd_partitions(arctic_mtd, arctic_partitions, 2);
+	return add_mtd_partitions(arctic_mtd, arctic_partitions, 3);
 }
 
 static void __exit