leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

Browse Source 
* 'master' of git://git.denx.de/u-boot-cfi-flash:
  cfi: fix the incomplete erased status check in buffer write
This commit is contained in:
Wolfgang Denk
2012-03-23 21:59:16 +01:00
parent 636f77a5a6 85c344e5f9
commit 7cb30b13f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/cfi_flash.c
View File

@@ -873,7 +873,7 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
void *src = cp; void *src = cp;
void *dst = (void *)dest; void *dst = (void *)dest;
void *dst2 = dst; void *dst2 = dst;
int flag = 0; int flag = 1;
uint offset = 0; uint offset = 0;
unsigned int shift; unsigned int shift;
uchar write_cmd; uchar write_cmd;
@@ -898,7 +898,7 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
cnt = len >> shift; cnt = len >> shift;
while ((cnt-- > 0) && (flag == 0)) { while ((cnt-- > 0) && (flag == 1)) {
switch (info->portwidth) { switch (info->portwidth) {
case FLASH_CFI_8BIT: case FLASH_CFI_8BIT:
flag = ((flash_read8(dst2) & flash_read8(src)) == flag = ((flash_read8(dst2) & flash_read8(src)) ==