diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-05 02:11:59 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-05 02:11:59 +0100 |
| commit | 2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch) | |
| tree | e19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /drivers/mtd/spi/stmicro.c | |
| parent | cd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff) | |
| parent | f68ab43de67f59925542efb6bcec30f4a84fe695 (diff) | |
| download | u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.zip u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.gz u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.bz2 | |
Merge branch 'master' into next
Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/mtd/spi/stmicro.c')
| -rw-r--r-- | drivers/mtd/spi/stmicro.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index 9b910c1..ae0d047 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -281,7 +281,8 @@ int stmicro_erase(struct spi_flash *flash, u32 offset, size_t len) ret = 0; for (actual = 0; actual < len; actual++) { - cmd[1] = (offset / sector_size) + actual; + cmd[1] = offset >> 16; + offset += sector_size; ret = spi_flash_cmd(flash->spi, CMD_M25PXX_WREN, NULL, 0); if (ret < 0) { |