Merge branch 'master' of git://git.denx.de/u-boot-rockchip

[platform/kernel/u-boot.git] / cmd / jffs2.c

diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 0b2eefa..9be198e 100644 (file)
--- 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;
                }
 
@@ -242,11 +242,11 @@ static int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *d
 static inline u32 get_part_sector_size_nand(struct mtdids *id)
 {
 #if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
-       nand_info_t *nand;
+       struct mtd_info *mtd;
 
-       nand = &nand_info[id->num];
+       mtd = nand_info[id->num];
 
-       return nand->erasesize;
+       return mtd->erasesize;
 #else
        BUG();
        return 0;
@@ -606,7 +606,7 @@ U_BOOT_CMD(
        "      with offset 'off'"
 );
 U_BOOT_CMD(
-       ls,     2,      1,      do_jffs2_ls,
+       fsls,   2,      1,      do_jffs2_ls,
        "list files in a directory (default /)",
        "[ directory ]"
 );