jffs2: add sector_size field to part_info structure

This patch adds sector_size field to part_info structure (used
by new JFFS2 code).

Signed-off-by: Ilya Yanok <yanok@emcraft.com>

diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index c2caade8457658baa1e81efe654cf6c96e9d9396..7866c808dd4c752fa0ca0a9acd029f5166c0b79b 100644 (file)
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -339,11 +339,15 @@ static int part_validate_nor(struct mtdids *id, struct part_info *part)
        extern flash_info_t flash_info[];
        flash_info_t *flash;
        int offset_aligned;
-       u32 end_offset;
+       u32 end_offset, sector_size = 0;
        int i;
 
        flash = &flash_info[id->num];
 
+       /* size of last sector */
+       part->sector_size = flash->size -
+               (flash->start[flash->sector_count-1] - flash->start[0]);
+
        offset_aligned = 0;
        for (i = 0; i < flash->sector_count; i++) {
                if ((flash->start[i] - flash->start[0]) == part->offset) {
@@ -358,12 +362,18 @@ static int part_validate_nor(struct mtdids *id, struct part_info *part)
        }
 
        end_offset = part->offset + part->size;
+       offset_aligned = 0;
        for (i = 0; i < flash->sector_count; i++) {
+               if (i) {
+                       sector_size = flash->start[i] - flash->start[i-1];
+                       if (part->sector_size < sector_size)
+                               part->sector_size = sector_size;
+               }
                if ((flash->start[i] - flash->start[0]) == end_offset)
-                       return 0;
+                       offset_aligned = 1;
        }
 
-       if (flash->size == end_offset)
+       if (offset_aligned || flash->size == end_offset)
                return 0;
 
        printf("%s%d: partition (%s) size alignment incorrect\n",
@@ -389,6 +399,8 @@ static int part_validate_nand(struct mtdids *id, struct part_info *part)
 
        nand = &nand_info[id->num];
 
+       part->sector_size = nand->erasesize;
+
        if ((unsigned long)(part->offset) % nand->erasesize) {
                printf("%s%d: partition (%s) start offset alignment incorrect\n",
                                MTD_DEV_TYPE(id->type), id->num, part->name);
@@ -424,6 +436,8 @@ static int part_validate_onenand(struct mtdids *id, struct part_info *part)
 
        mtd = &onenand_mtd;
 
+       part->sector_size = mtd->erasesize;
+
        if ((unsigned long)(part->offset) % mtd->erasesize) {
                printf("%s%d: partition (%s) start offset"
                        "alignment incorrect\n",

diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h
index e9b7d6e7c9d454cfe6a8af01c2b8d74453d40838..8b2720e951a18b4de5f054b2c16906537af72b17 100644 (file)
--- a/include/jffs2/load_kernel.h
+++ b/include/jffs2/load_kernel.h
@@ -50,6 +50,7 @@ struct part_info {
        u32 offset;                     /* offset within device */
        void *jffs2_priv;               /* used internaly by jffs2 */
        u32 mask_flags;                 /* kernel MTD mask flags */
+       u32 sector_size;                /* size of sector */
        struct mtd_device *dev;         /* parent device */
 };