diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-09-05 01:53:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 29b8205a22c3dbd5db25b0f312140959f028a9c5 (patch) | |
| tree | 4692d87ccdf549655e3a30b635a9083eb81f4c1c | |
| parent | 8f5e029c522d0bfaa9bbc55281e6a76e37afa15c (diff) | |
| parent | fb1ddf7bcf2a8ad5a329ed05d2c3500d61e2e44e (diff) | |
| download | olio-linux-3.10-29b8205a22c3dbd5db25b0f312140959f028a9c5.tar.xz olio-linux-3.10-29b8205a22c3dbd5db25b0f312140959f028a9c5.zip | |
Merge "New partition table. Now with all the partitions that Android expects (even though we're not quite making use of them yet)." into android-3.10-bringup
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 69 |
1 files changed, 42 insertions, 27 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 4e07525aec7..84dde6d63b0 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -101,48 +101,63 @@ static struct of_device_id omap_dt_match_table[] __initdata = { }; static struct mtd_partition omap3h1_nand_partitions[] = { - /* All the partition sizes are listed in terms of NAND block size */ +/* All the partition sizes are listed in terms of NAND block size */ { - .name = "X-Loader", - .offset = 0, - .size = 4 * NAND_BLOCK_SIZE, - .mask_flags = MTD_WRITEABLE, /* force read-only */ + .name = "X-Loader", + .offset = 0, + .size = 4 * NAND_BLOCK_SIZE, /* 512Kb */ + .mask_flags = MTD_WRITEABLE, /* force read-only */ }, { - .name = "U-Boot", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */ - .size = 15 * NAND_BLOCK_SIZE, - .mask_flags = MTD_WRITEABLE, /* force read-only */ + .name = "U-Boot", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */ + .size = 15 * NAND_BLOCK_SIZE, /* ~2Mb */ + .mask_flags = MTD_WRITEABLE, /* force read-only */ }, { - .name = "U-Boot Env", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x260000 */ - .size = 1 * NAND_BLOCK_SIZE, + .name = "U-Boot Env", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x260000 */ + .size = 1 * NAND_BLOCK_SIZE, /* 128Kb */ }, { - .name = "kernel", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */ - .size = 40 * NAND_BLOCK_SIZE, + .name = "kernel", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */ + .size = 40 * NAND_BLOCK_SIZE, /* ~5Mb */ }, { - .name = "initramfs", - .offset = MTDPART_OFS_APPEND, /* Offset = 0xC80000 */ - .size = 80 * NAND_BLOCK_SIZE, + .name = "initramfs", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x780000 */ + .size = 80 * NAND_BLOCK_SIZE, /* ~10Mb */ }, { - .name = "ramdisk", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x1180000 */ - .size = 40 * NAND_BLOCK_SIZE, + .name = "devicetree", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x1180000 */ + .size = 4 * NAND_BLOCK_SIZE, /* 512Kb */ }, { - .name = "system", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x1680000 */ - .size = 2000 * NAND_BLOCK_SIZE, + .name = "ramdisk", /* For Android's ramdisk */ + .offset = MTDPART_OFS_APPEND, /* Offset = 0x1200000 */ + .size = 100 * NAND_BLOCK_SIZE, /* ~12Mb */ }, { - .name = "userdata", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x11180000 */ - .size = MTDPART_SIZ_FULL, + .name = "system", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x1E80000 */ + .size = 2048 * NAND_BLOCK_SIZE, /* 0x7D0*0x20000 = ~256Mb */ + }, + { + .name = "cache", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x11E80000 */ + .size = 400 * NAND_BLOCK_SIZE, /* 0x190*0x20000 = ~50Mb */ + }, + { + .name = "recovery", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x14A80000 */ + .size = 200 * NAND_BLOCK_SIZE, /* C8*20000 = ~26Mb */ + }, + { + .name = "userdata", + .offset = MTDPART_OFS_APPEND, /* Offset = 0x16380000 */ + .size = MTDPART_SIZ_FULL, /* the rest */ }, }; |