summaryrefslogtreecommitdiff
path: root/common/cmd_jffs2.c
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-02-06 17:20:09 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-02-06 17:20:09 +0900
commitbdaef38171c9ea030bae46b798aba4f430dcac18 (patch)
tree4da072aceaa42e7ff3ec9962f5d99a9ca667ace9 /common/cmd_jffs2.c
parented44387f406ca0e695609270a1282e699111a945 (diff)
parentc20a3c0bac909a0a1311eaafdec156b6a8686d46 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: cpu/arm_cortexa8/s5pc1xx/cache.c include/configs/spear6xx.h lib_ppc/reloc.S Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'common/cmd_jffs2.c')
-rw-r--r--common/cmd_jffs2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 372ccb2aa3c..6799ccaa0ac 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -406,8 +406,6 @@ int mtdparts_init(void)
part->offset = 0x00000000;
#endif
- part->sector_size = get_part_sector_size(id, part);
-
part->dev = current_mtd_dev;
INIT_LIST_HEAD(&part->link);
@@ -415,6 +413,8 @@ int mtdparts_init(void)
if (part->size == SIZE_REMAINING)
part->size = id->size - part->offset;
+ part->sector_size = get_part_sector_size(id, part);
+
DEBUGF("part : name = %s, size = 0x%08lx, offset = 0x%08lx\n",
part->name, part->size, part->offset);