From 6559a82a010a006cbcf0ca125ea929d57123a49c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 10 Sep 2003 21:04:03 +0100 Subject: [PATCH] [ARM PATCH] 1653/1: Simpad Flash Partition resubmit Patch from Holger Freyther This the the resubmit of the flash partition changes for SIMpad. Two versions one for cramfs one for all jffs2 and also the SIM has two banks instead of one even if they're next to each other... --- drivers/mtd/maps/sa1100-flash.c | 35 ++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index f43bb610dfc06..9bfef0fbe8ac5 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c @@ -654,28 +654,21 @@ static struct mtd_partition simpad_partitions[] = { }, { .name = "SIMpad kernel", .size = 0x00100000, - .offset = 0x00080000, - }, { -#ifdef CONFIG_JFFS2_FS - .name = "SIMpad root jffs2", - .size = MTDPART_SIZ_FULL, - .offset = 0x00180000, -#else - .name = "SIMpad initrd", - .size = 0x00300000, - .offset = 0x00180000, + .offset = MTDPART_OFS_APPEND, }, { +#ifdef CONFIG_ROOT_CRAMFS .name = "SIMpad root cramfs", - .size = 0x00300000, - .offset = 0x00480000, - }, { - .name = "SIMpad usr cramfs", - .size = 0x005c0000, - .offset = 0x00780000, + .size =0x00D80000, + .offset = MTDPART_OFS_APPEND + }, { - .name = "SIMpad usr local", + .name = "SIMpad local jffs2", + .size = MTDPART_SIZ_FULL, + .offset = MTDPART_OFS_APPEND +#else + .name = "SIMpad root jffs2", .size = MTDPART_SIZ_FULL, - .offset = 0x00d40000, + .offset = MTDPART_OFS_APPEND #endif } }; @@ -1244,8 +1237,10 @@ static int __init sa1100_locate_flash(void) } if (machine_is_simpad()) { info[0].base = SA1100_CS0_PHYS; - info[0].size = SZ_32M; - nr = 1; + info[0].size = SZ_16M; + info[1].base = SA1100_CS1_PHYS; + info[1].size = SZ_16M; + nr = 2; } if (machine_is_stork()) { info[0].base = SA1100_CS0_PHYS; -- 2.53.0