From 95c0a2e2269d18875aa1f1805fb1229f901aa790 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 6 Nov 2008 12:52:39 +0000 Subject: [PATCH] brcm63xx: rename mtd partitions to the ones used by other openwrt platforms - should make the automatic rootfs overlay split work and fix the mounting of the right partition git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13130 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files/drivers/mtd/maps/bcm963xx-flash.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c b/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c index 7d01a9e8f..504dfac84 100644 --- a/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c +++ b/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c @@ -128,10 +128,6 @@ int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts nrparts++; namelen =+ 6; }; - if (sparelen > 0){ - nrparts++; - namelen =+ 6; - }; // Ask kernel for more memory. parts = kmalloc(sizeof(*parts)*nrparts+10*nrparts, GFP_KERNEL); if (!parts){ @@ -145,24 +141,20 @@ int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts parts[curpart].size = master->erasesize; curpart++; if (kernellen > 0){ - parts[curpart].name = "Kernel"; + parts[curpart].name = "kernel"; parts[curpart].offset = kerneladdr; parts[curpart].size = kernellen; curpart++; }; if (rootfslen > 0){ - parts[curpart].name = "Rootfs"; + parts[curpart].name = "rootfs"; parts[curpart].offset = rootfsaddr; parts[curpart].size = rootfslen; + if (sparelen > 0) + parts[curpart].size += sparelen; curpart++; }; - if (sparelen > 0){ - parts[curpart].name = "OpenWrt"; - parts[curpart].offset = spareaddr; - parts[curpart].size = sparelen; - curpart++; - }; - parts[curpart].name = "NVRAM"; + parts[curpart].name = "nvram"; parts[curpart].offset = master->size - master->erasesize; parts[curpart].size = master->erasesize; for (i = 0; i < nrparts; i++) { -- 2.20.1