summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-01 21:39:34 +0200
committerWolfgang Denk <wd@denx.de>2008-05-01 21:39:34 +0200
commit50f93d30dae3c5d888aa244d964ccd77be9b1c0c (patch)
tree5a274e3d944e2fb9a8d1b287fc24a2bbd2990eff
parentfed4de0135fdc13565704669cdf80902bbfe3c42 (diff)
parentd2c6fbec4397c936b18cd42482b6973cd6781bdf (diff)
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
-rw-r--r--drivers/mtd/onenand/onenand_base.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 174384eab9..d1b9f8f546 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -21,7 +21,7 @@
#include <asm/errno.h>
/* It should access 16-bit instead of 8-bit */
-static inline void *memcpy(void *dst, const void *src, unsigned int len)
+static inline void *memcpy_16(void *dst, const void *src, unsigned int len)
{
void *ret = dst;
short *d = dst;
@@ -358,7 +358,7 @@ static int onenand_read_bufferram(struct mtd_info *mtd, int area,
bufferram = this->base + area;
bufferram += onenand_bufferram_offset(mtd, area);
- memcpy(buffer, bufferram + offset, count);
+ memcpy_16(buffer, bufferram + offset, count);
return 0;
}
@@ -385,7 +385,7 @@ static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area,
this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ);
- memcpy(buffer, bufferram + offset, count);
+ memcpy_16(buffer, bufferram + offset, count);
this->mmcontrol(mtd, 0);
@@ -412,7 +412,7 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area,
bufferram = this->base + area;
bufferram += onenand_bufferram_offset(mtd, area);
- memcpy(bufferram + offset, buffer, count);
+ memcpy_16(bufferram + offset, buffer, count);
return 0;
}