From: Joe Hershberger <joe.hershberger@ni.com>
Date: Wed, 22 Aug 2012 21:49:43 +0000 (-0500)
Subject: nand: Change ulong to loff_t and size_t
X-Git-Tag: v2012.10-rc1~38^2~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e331ab2ee9b141f1de2a8fb0bfaf52f6273022f9;p=oweals%2Fu-boot.git

nand: Change ulong to loff_t and size_t

Missed in previous cleanup.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
---

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index c66eeefcb6..5ef7df7401 100644
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -321,7 +321,8 @@ int nand_get_lock_status(struct mtd_info *mtd, loff_t offset)
  *
  * @return		0 on success, -1 in case of error
  */
-int nand_unlock(struct mtd_info *mtd, ulong start, ulong length, int allexcept)
+int nand_unlock(struct mtd_info *mtd, loff_t start, size_t length,
+	int allexcept)
 {
 	int ret = 0;
 	int chipnr;
@@ -329,7 +330,7 @@ int nand_unlock(struct mtd_info *mtd, ulong start, ulong length, int allexcept)
 	int page;
 	struct nand_chip *chip = mtd->priv;
 
-	debug("nand_unlock%s: start: %08x, length: %d!\n",
+	debug("nand_unlock%s: start: %08llx, length: %d!\n",
 		allexcept ? " (allexcept)" : "", start, length);
 
 	/* select the NAND device */
diff --git a/include/nand.h b/include/nand.h
index e9b47f1b25..ff061c0b7c 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -145,7 +145,8 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts);
 #define NAND_LOCK_STATUS_UNLOCK 0x04
 
 int nand_lock(nand_info_t *meminfo, int tight);
-int nand_unlock(nand_info_t *meminfo, ulong start, ulong length, int allexcept);
+int nand_unlock(nand_info_t *meminfo, loff_t start, size_t length,
+	int allexcept);
 int nand_get_lock_status(nand_info_t *meminfo, loff_t offset);
 
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);