summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-08-22 16:49:43 -0500
committerScott Wood <scottwood@freescale.com>2012-09-17 17:33:42 -0500
commite331ab2ee9b141f1de2a8fb0bfaf52f6273022f9 (patch)
treecf00c71c91eeeee4e422e1a989659c66575f3eb5
parenteee623a5049963d0c085be37128bbd22bee1ba1e (diff)
downloadu-boot-imx-e331ab2ee9b141f1de2a8fb0bfaf52f6273022f9.zip
u-boot-imx-e331ab2ee9b141f1de2a8fb0bfaf52f6273022f9.tar.gz
u-boot-imx-e331ab2ee9b141f1de2a8fb0bfaf52f6273022f9.tar.bz2
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>
-rw-r--r--drivers/mtd/nand/nand_util.c5
-rw-r--r--include/nand.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index c66eeef..5ef7df7 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 e9b47f1..ff061c0 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);