mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 14:41:31 +00:00
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
This commit is contained in:
commit
50f93d30da
1 changed files with 4 additions and 4 deletions
|
@ -21,7 +21,7 @@
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
|
|
||||||
/* It should access 16-bit instead of 8-bit */
|
/* 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;
|
void *ret = dst;
|
||||||
short *d = dst;
|
short *d = dst;
|
||||||
|
@ -358,7 +358,7 @@ static int onenand_read_bufferram(struct mtd_info *mtd, int area,
|
||||||
bufferram = this->base + area;
|
bufferram = this->base + area;
|
||||||
bufferram += onenand_bufferram_offset(mtd, area);
|
bufferram += onenand_bufferram_offset(mtd, area);
|
||||||
|
|
||||||
memcpy(buffer, bufferram + offset, count);
|
memcpy_16(buffer, bufferram + offset, count);
|
||||||
|
|
||||||
return 0;
|
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);
|
this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ);
|
||||||
|
|
||||||
memcpy(buffer, bufferram + offset, count);
|
memcpy_16(buffer, bufferram + offset, count);
|
||||||
|
|
||||||
this->mmcontrol(mtd, 0);
|
this->mmcontrol(mtd, 0);
|
||||||
|
|
||||||
|
@ -412,7 +412,7 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area,
|
||||||
bufferram = this->base + area;
|
bufferram = this->base + area;
|
||||||
bufferram += onenand_bufferram_offset(mtd, area);
|
bufferram += onenand_bufferram_offset(mtd, area);
|
||||||
|
|
||||||
memcpy(bufferram + offset, buffer, count);
|
memcpy_16(bufferram + offset, buffer, count);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue