diff options
| author | Tom Rini <trini@ti.com> | 2013-10-14 09:37:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-14 09:37:51 -0400 |
| commit | bff4fae4fc29376e62ac6d420b189f23a57e4294 (patch) | |
| tree | 0c7ab6c11c27efff41e308052af7907ed3f6ddb3 /include | |
| parent | 99b4eaa68e0e2fdd9b0d0b1d40809d7e8f92044f (diff) | |
| parent | cc734f5ab26134e5e8d57c34edc257c89ac5b1d2 (diff) | |
| download | talos-obmc-uboot-bff4fae4fc29376e62ac6d420b189f23a57e4294.tar.gz talos-obmc-uboot-bff4fae4fc29376e62ac6d420b189f23a57e4294.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include')
| -rw-r--r-- | include/jffs2/load_kernel.h | 6 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h index e1943e507c..dd0d23fa52 100644 --- a/include/jffs2/load_kernel.h +++ b/include/jffs2/load_kernel.h @@ -32,8 +32,8 @@ struct part_info { struct list_head link; char *name; /* partition name */ u8 auto_name; /* set to 1 for generated name */ - u32 size; /* total size of the partition */ - u32 offset; /* offset within device */ + u64 size; /* total size of the partition */ + u64 offset; /* offset within device */ void *jffs2_priv; /* used internaly by jffs2 */ u32 mask_flags; /* kernel MTD mask flags */ u32 sector_size; /* size of sector */ @@ -44,7 +44,7 @@ struct mtdids { struct list_head link; u8 type; /* device type */ u8 num; /* device number */ - u32 size; /* device size */ + u64 size; /* device size */ char *mtd_id; /* linux kernel device id */ }; diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 2055584374..0546565593 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -464,6 +464,8 @@ struct nand_buffers { * @pagemask: [INTERN] page number mask = number of (pages / chip) - 1 * @pagebuf: [INTERN] holds the pagenumber which is currently in * data_buf. + * @pagebuf_bitflips: [INTERN] holds the bitflip count for the page which is + * currently in data_buf. * @subpagesize: [INTERN] holds the subpagesize * @onfi_version: [INTERN] holds the chip ONFI version (BCD encoded), * non 0 if ONFI supported. @@ -531,6 +533,7 @@ struct nand_chip { uint64_t chipsize; int pagemask; int pagebuf; + unsigned int pagebuf_bitflips; int subpagesize; uint8_t cellinfo; int badblockpos; |
