hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

brcm47xx: mtd map driver cleanup - reuse generic mtd rootfs split 

SVN-Revision: 7172
owl
Felix Fietkau 2007-05-10 13:56:54 +00:00
parent bd65c8b91a
commit 862103b039
2 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/brcm47xx-2.6/config/default
View File

@ -196,7 +196,7 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_ROM is not set # CONFIG_MTD_ROM is not set
# CONFIG_MTD_SLRAM is not set # CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_SPLIT_ROOTFS is not set CONFIG_MTD_SPLIT_ROOTFS=y
# CONFIG_NATSEMI is not set # CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set # CONFIG_NE2K_PCI is not set
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set

47
target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
View File

@ -46,8 +46,6 @@
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#endif #endif
#include <linux/squashfs_fs.h>
#include <linux/jffs2.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#ifdef CONFIG_SSB #ifdef CONFIG_SSB
#include <linux/ssb/ssb.h> #include <linux/ssb/ssb.h>
@ -95,7 +93,6 @@ static struct mtd_partition bcm947xx_parts[] = {
{ name: "linux", offset: 0, size: 0, }, { name: "linux", offset: 0, size: 0, },
{ name: "rootfs", offset: 0, size: 0, }, { name: "rootfs", offset: 0, size: 0, },
{ name: "nvram", offset: 0, size: 0, }, { name: "nvram", offset: 0, size: 0, },
{ name: "rootfs_data", offset: 0, size: 0, },
{ name: NULL, }, { name: NULL, },
}; };
@ -259,24 +256,8 @@ find_root(struct mtd_info *mtd, size_t size, struct mtd_partition *part)
if (mtd->read(mtd, part->offset, sizeof(buf), &len, buf) || len != sizeof(buf)) if (mtd->read(mtd, part->offset, sizeof(buf), &len, buf) || len != sizeof(buf))
return 0; return 0;
if (*((__u32 *) buf) == SQUASHFS_MAGIC) { /* Move the fs outside of the trx */
printk(KERN_INFO "%s: Filesystem type: squashfs, size=0x%x\n", mtd->name, (u32) sb->bytes_used); part->size = 0;
/* Update the squashfs partition size based on the superblock info */
part->size = sb->bytes_used;
len = part->offset + part->size;
len += (mtd->erasesize - 1);
len &= ~(mtd->erasesize - 1);
part->size = len - part->offset;
} else if (*((__u16 *) buf) == JFFS2_MAGIC_BITMASK) {
printk(KERN_INFO "%s: Filesystem type: jffs2\n", mtd->name);
/* Move the squashfs outside of the trx */
part->size = 0;
} else {
printk(KERN_INFO "%s: Filesystem type: unknown\n", mtd->name);
return 0;
}
if (trx.len != part->offset + part->size - off) { if (trx.len != part->offset + part->size - off) {
/* Update the trx offsets and length */ /* Update the trx offsets and length */
@ -355,32 +336,8 @@ init_mtd_partitions(struct mtd_info *mtd, size_t size)
/* find and size rootfs */ /* find and size rootfs */
if (find_root(mtd,size,&bcm947xx_parts[2])==0) { if (find_root(mtd,size,&bcm947xx_parts[2])==0) {
/* entirely jffs2 */
bcm947xx_parts[4].name = NULL;
bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset - bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -
bcm947xx_parts[3].size; bcm947xx_parts[3].size;
} else {
/* legacy setup */
/* calculate leftover flash, and assign it to the jffs2 partition */
if (cfe_size != 384 * 1024) {
bcm947xx_parts[4].offset = bcm947xx_parts[2].offset +
bcm947xx_parts[2].size;
if ((bcm947xx_parts[4].offset % mtd->erasesize) > 0) {
bcm947xx_parts[4].offset += mtd->erasesize -
(bcm947xx_parts[4].offset % mtd->erasesize);
}
bcm947xx_parts[4].size = bcm947xx_parts[3].offset -
bcm947xx_parts[4].offset;
} else {
bcm947xx_parts[4].offset = bcm947xx_parts[2].offset +
bcm947xx_parts[2].size;
if ((bcm947xx_parts[4].offset % mtd->erasesize) > 0) {
bcm947xx_parts[4].offset += mtd->erasesize -
(bcm947xx_parts[4].offset % mtd->erasesize);
}
bcm947xx_parts[4].size = size - bcm947xx_parts[3].size -
bcm947xx_parts[4].offset;
}
} }
return bcm947xx_parts; return bcm947xx_parts;