diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-13 22:04:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-13 22:04:11 +0200 |
| commit | f16b608ae7d0c4611d3a41d2570616a498e64d4c (patch) | |
| tree | 213c9f261e590c22f21683a619d997a895ada35b /drivers/mtd/spi/spi_flash.c | |
| parent | 107b56bdd8e82b07458df11f8df4a01067512281 (diff) | |
| parent | 1c091f59a03af9f2e821cb054fd555a2748dd091 (diff) | |
| download | olio-uboot-2014.01-f16b608ae7d0c4611d3a41d2570616a498e64d4c.tar.xz olio-uboot-2014.01-f16b608ae7d0c4611d3a41d2570616a498e64d4c.zip | |
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'drivers/mtd/spi/spi_flash.c')
| -rw-r--r-- | drivers/mtd/spi/spi_flash.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 5c261f14a..c75b716fd 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -131,12 +131,13 @@ int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout) } int spi_flash_cmd_erase(struct spi_flash *flash, u8 erase_cmd, - u32 erase_size, u32 offset, size_t len) + u32 offset, size_t len) { - u32 start, end; + u32 start, end, erase_size; int ret; u8 cmd[4]; + erase_size = flash->sector_size; if (offset % erase_size || len % erase_size) { debug("SF: Erase offset/length not multiple of erase size\n"); return -1; @@ -296,6 +297,10 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, goto err_manufacturer_probe; } + printf("SF: Detected %s with page size ", flash->name); + print_size(flash->sector_size, ", total "); + print_size(flash->size, "\n"); + spi_release_bus(spi); return flash; |