aboutsummaryrefslogtreecommitdiff
path: root/cmd/jffs2.c
diff options
context:
space:
mode:
authorScott Wood <oss@buserror.net>2016-05-30 13:57:55 -0500
committerScott Wood <oss@buserror.net>2016-06-03 20:27:48 -0500
commitb616d9b0a708eb90eb474e1b6ec6dfe4c48a1678 (patch)
treee3710a7c0725a062e6049fe6c281575587ea6b66 /cmd/jffs2.c
parent151c06ec61d74b77cf27d6d622bab6370c949c66 (diff)
downloadu-boot-b616d9b0a708eb90eb474e1b6ec6dfe4c48a1678.zip
u-boot-b616d9b0a708eb90eb474e1b6ec6dfe4c48a1678.tar.gz
u-boot-b616d9b0a708eb90eb474e1b6ec6dfe4c48a1678.tar.bz2
nand: Embed mtd_info in struct nand_chip
nand_info[] is now an array of pointers, with the actual mtd_info instance embedded in struct nand_chip. This is in preparation for syncing the NAND code with Linux 4.6, which makes the same change to struct nand_chip. It's in a separate commit due to the large amount of changes required to accommodate the change to nand_info[]. Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'cmd/jffs2.c')
-rw-r--r--cmd/jffs2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index e4eaa48..f00d53a 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -167,7 +167,7 @@ static int mtd_device_validate(u8 type, u8 num, u32 *size)
} else if (type == MTD_DEV_TYPE_NAND) {
#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
if (num < CONFIG_SYS_MAX_NAND_DEVICE) {
- *size = nand_info[num].size;
+ *size = nand_info[num]->size;
return 0;
}
@@ -244,7 +244,7 @@ static inline u32 get_part_sector_size_nand(struct mtdids *id)
#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
struct mtd_info *mtd;
- mtd = &nand_info[id->num];
+ mtd = nand_info[id->num];
return mtd->erasesize;
#else