diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /drivers/mtd/spi/stmicro.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | olio-uboot-2014.01-f82642e33899766892499b163e60560fbbf87773.tar.xz olio-uboot-2014.01-f82642e33899766892499b163e60560fbbf87773.zip | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/mtd/spi/stmicro.c')
| -rw-r--r-- | drivers/mtd/spi/stmicro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index c999b125e..b8b835a3f 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -295,7 +295,7 @@ int stmicro_erase(struct spi_flash *flash, u32 offset, size_t len) } /* Up to 2 seconds */ - ret = stmicro_wait_ready(flash, 2 * CFG_HZ); + ret = stmicro_wait_ready(flash, 2 * CONFIG_SYS_HZ); if (ret < 0) { debug("SF: STMicro page erase timed out\n"); break; |