aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-05-11 15:36:57 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-05-11 15:36:57 +0000
commita1d98e132f8dbff01807eb8be3e0995717761ab8 (patch)
tree80443a8e3d5e8556ba73d1061e7ee7991e0b7369
parent8176e9361af5f691a157e8787d2f6d3476d3539b (diff)
downloadupstream-a1d98e132f8dbff01807eb8be3e0995717761ab8.tar.gz
upstream-a1d98e132f8dbff01807eb8be3e0995717761ab8.tar.bz2
upstream-a1d98e132f8dbff01807eb8be3e0995717761ab8.zip
Backport [7172] to adm5120 mtd map driver
SVN-Revision: 7184
-rw-r--r--target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c44
1 files changed, 2 insertions, 42 deletions
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
index c2a817be2f..a353926746 100644
--- a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
+++ b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
@@ -312,24 +312,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))
return 0;
- if (*((__u32 *) buf) == SQUASHFS_MAGIC) {
- printk(KERN_INFO "%s: Filesystem type: squashfs, size=0x%x\n", mtd->name, (u32) sb->bytes_used);
-
- /* 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;
- }
+ /* Move the fs outside of the trx */
+ part->size = 0;
if (trx.len != part->offset + part->size - off) {
/* Update the trx offsets and length */
@@ -408,32 +392,8 @@ init_mtd_partitions(struct mtd_info *mtd, size_t size)
/* find and size rootfs */
if (find_root(mtd,size,&adm5120_cfe_parts[2])==0) {
- /* entirely jffs2 */
- adm5120_cfe_parts[4].name = NULL;
adm5120_cfe_parts[2].size = size - adm5120_cfe_parts[2].offset -
adm5120_cfe_parts[3].size;
- } else {
- /* legacy setup */
- /* calculate leftover flash, and assign it to the jffs2 partition */
- if (cfe_size != 384 * 1024) {
- adm5120_cfe_parts[4].offset = adm5120_cfe_parts[2].offset +
- adm5120_cfe_parts[2].size;
- if ((adm5120_cfe_parts[4].offset % mtd->erasesize) > 0) {
- adm5120_cfe_parts[4].offset += mtd->erasesize -
- (adm5120_cfe_parts[4].offset % mtd->erasesize);
- }
- adm5120_cfe_parts[4].size = adm5120_cfe_parts[3].offset -
- adm5120_cfe_parts[4].offset;
- } else {
- adm5120_cfe_parts[4].offset = adm5120_cfe_parts[2].offset +
- adm5120_cfe_parts[2].size;
- if ((adm5120_cfe_parts[4].offset % mtd->erasesize) > 0) {
- adm5120_cfe_parts[4].offset += mtd->erasesize -
- (adm5120_cfe_parts[4].offset % mtd->erasesize);
- }
- adm5120_cfe_parts[4].size = size - adm5120_cfe_parts[3].size -
- adm5120_cfe_parts[4].offset;
- }
}
return adm5120_cfe_parts;