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

This commit is contained in:
Wolfgang Denk 2008-11-01 16:11:08 +01:00
commit d1e990ce0f

View File

@ -596,7 +596,8 @@ static int flash_toggle (flash_info_t * info, flash_sect_t sect,
retval = flash_read32(addr) != flash_read32(addr); retval = flash_read32(addr) != flash_read32(addr);
break; break;
case FLASH_CFI_64BIT: case FLASH_CFI_64BIT:
retval = flash_read64(addr) != flash_read64(addr); retval = ( (flash_read32( addr ) != flash_read32( addr )) ||
(flash_read32(addr+4) != flash_read32(addr+4)) );
break; break;
default: default:
retval = 0; retval = 0;