From: Jason Jin Date: Fri, 19 Sep 2008 09:32:49 +0000 (+0800) Subject: Fix the NAND size overflow issue. X-Git-Tag: v2008.10-rc3~15 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fecb5ade3b37f62981f2b05b621005850173aaa9;p=u-boot Fix the NAND size overflow issue. When the total size of all NAND devices exceeds 4 GiB, the size will overflow. This patch tries to fix this. Note that we still have a problem when a single NAND device is bigger than 4 GiB: then the overflow would actually happen earlier, i. e. when storing the size in nand_info[].size, as nand_info[].size is an "u_int32_t". Signed-off-by: Jason Jin Signed-off-by: Wolfgang Denk --- diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c index ebd2acd02b..71a0e4bbb1 100644 --- a/drivers/mtd/nand/nand.c +++ b/drivers/mtd/nand/nand.c @@ -63,11 +63,11 @@ void nand_init(void) unsigned int size = 0; for (i = 0; i < CFG_MAX_NAND_DEVICE; i++) { nand_init_chip(&nand_info[i], &nand_chip[i], base_address[i]); - size += nand_info[i].size; + size += nand_info[i].size / 1024; if (nand_curr_device == -1) nand_curr_device = i; } - printf("%u MiB\n", size / (1024 * 1024)); + printf("%u MiB\n", size / 1024); #ifdef CFG_NAND_SELECT_DEVICE /*