diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-11-01 16:11:08 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-01 16:11:08 +0100 |
| commit | d1e990ce0f9b98e81338c8627d41aff2268eb464 (patch) | |
| tree | d26289b026e2ccf376a1a0fdced9c8e1667bcdb1 | |
| parent | 41e7bbe0097713cd76edd65995620fa1eb120407 (diff) | |
| parent | 9abda6ba735efb059f63dcb25d78b174bfcad1ad (diff) | |
| download | u-boot-imx-d1e990ce0f9b98e81338c8627d41aff2268eb464.zip u-boot-imx-d1e990ce0f9b98e81338c8627d41aff2268eb464.tar.gz u-boot-imx-d1e990ce0f9b98e81338c8627d41aff2268eb464.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c40bf66..24e9b9f 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -596,7 +596,8 @@ static int flash_toggle (flash_info_t * info, flash_sect_t sect, retval = flash_read32(addr) != flash_read32(addr); break; 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; default: retval = 0; |