minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

jffs2: add sector_size field to part_info structure

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

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
This commit is contained in:
Ilya Yanok 2008-11-13 19:49:32 +03:00 committed by Wolfgang Denk
parent f738469567
commit e0b5532579
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/cmd_jffs2.c
View File

@ -339,11 +339,15 @@ static int part_validate_nor(struct mtdids *id, struct part_info *part)
extern flash_info_t flash_info[]; extern flash_info_t flash_info[];
flash_info_t *flash; flash_info_t *flash;
int offset_aligned; int offset_aligned;
u32 end_offset; u32 end_offset, sector_size = 0;
int i; int i;
flash = &flash_info[id->num]; 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; offset_aligned = 0;
for (i = 0; i < flash->sector_count; i++) { for (i = 0; i < flash->sector_count; i++) {
if ((flash->start[i] - flash->start[0]) == part->offset) { 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; end_offset = part->offset + part->size;
offset_aligned = 0;
for (i = 0; i < flash->sector_count; i++) { 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) 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; return 0;
printf("%s%d: partition (%s) size alignment incorrect\n", 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]; nand = &nand_info[id->num];
part->sector_size = nand->erasesize;
if ((unsigned long)(part->offset) % nand->erasesize) { if ((unsigned long)(part->offset) % nand->erasesize) {
printf("%s%d: partition (%s) start offset alignment incorrect\n", printf("%s%d: partition (%s) start offset alignment incorrect\n",
MTD_DEV_TYPE(id->type), id->num, part->name); 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; mtd = &onenand_mtd;
part->sector_size = mtd->erasesize;
if ((unsigned long)(part->offset) % mtd->erasesize) { if ((unsigned long)(part->offset) % mtd->erasesize) {
printf("%s%d: partition (%s) start offset" printf("%s%d: partition (%s) start offset"
"alignment incorrect\n", "alignment incorrect\n",

1
include/jffs2/load_kernel.h
View File

@ -50,6 +50,7 @@ struct part_info {
u32 offset; /* offset within device */ u32 offset; /* offset within device */
void *jffs2_priv; /* used internaly by jffs2 */ void *jffs2_priv; /* used internaly by jffs2 */
u32 mask_flags; /* kernel MTD mask flags */ u32 mask_flags; /* kernel MTD mask flags */
u32 sector_size; /* size of sector */
struct mtd_device *dev; /* parent device */ struct mtd_device *dev; /* parent device */
}; };