summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2009-05-11 16:03:55 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:45:47 +0200
commit8d2effea23e938631126a7888008a0637e13b389 (patch)
treee33073a1e09b6f5c340163a4581b81304fa3fa67 /common
parent0a57265533c412adf6024f4b4955141f4346b2b9 (diff)
downloadu-boot-imx-8d2effea23e938631126a7888008a0637e13b389.zip
u-boot-imx-8d2effea23e938631126a7888008a0637e13b389.tar.gz
u-boot-imx-8d2effea23e938631126a7888008a0637e13b389.tar.bz2
mtd: Update MTD infrastructure to support 64bit device size
This patch brings the U-Boot MTD infrastructure in sync with the current Linux MTD version (2.6.30-rc3). Biggest change is the 64bit device size support and a resync of the mtdpart.c file which has seen multiple fixes meanwhile. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Kyungmin Park <kmpark@infradead.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_onenand.c6
-rw-r--r--common/env_onenand.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c
index 5832ff8..e8f06d7 100644
--- a/common/cmd_onenand.c
+++ b/common/cmd_onenand.c
@@ -19,6 +19,10 @@
#include <asm/io.h>
+#if !defined(CONFIG_SYS_64BIT_VSPRINTF)
+#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
+#endif
+
static struct mtd_info *mtd;
static loff_t next_ofs;
@@ -53,7 +57,7 @@ static int arg_off_size(int argc, char *argv[], ulong *off, size_t *size)
}
if ((*off + *size) > mtd->size) {
- printf("total chip size (0x%x) exceeded!\n", mtd->size);
+ printf("total chip size (0x%llx) exceeded!\n", mtd->size);
return -1;
}
diff --git a/common/env_onenand.c b/common/env_onenand.c
index dbccc79..ed77051 100644
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -109,7 +109,7 @@ int saveenv(void)
if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.writesize, &retlen,
(u_char *) env_ptr)) {
- printf("OneNAND: write failed at 0x%08x\n", instr.addr);
+ printf("OneNAND: write failed at 0x%llx\n", instr.addr);
return 2;
}