aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-11-06 12:52:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-11-06 12:52:39 +0000
commitd0388bbe5c11fb7953ed7afddc3392f3ad2155d7 (patch)
treec9f72279f90ccb220475ec740adfd39848022b94 /target/linux
parent3fb55fea83bf918a22a953cf623a6ea1680489e3 (diff)
downloadupstream-d0388bbe5c11fb7953ed7afddc3392f3ad2155d7.tar.gz
upstream-d0388bbe5c11fb7953ed7afddc3392f3ad2155d7.tar.bz2
upstream-d0388bbe5c11fb7953ed7afddc3392f3ad2155d7.zip
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
SVN-Revision: 13130
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c18
1 files 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 7d01a9e8f0..504dfac849 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++) {