diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-22 11:36:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-22 11:36:45 -0400 |
| commit | 19d051a2b78b626ea3f8103a9a08e73508ba9fa6 (patch) | |
| tree | bef8b4aa02b9a2375a611778aa8460ac2235750b /drivers/mtd/spi/sandbox.c | |
| parent | 58c8c0963b1c720802c46ac4288c897e5f9cd296 (diff) | |
| parent | fe4753cbc6c51f712024121aad0d21293d6a85fc (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/mtd/spi/sandbox.c')
| -rw-r--r-- | drivers/mtd/spi/sandbox.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 53470b90ce..f59134ff92 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -292,10 +292,7 @@ static int sandbox_sf_process_cmd(struct sandbox_spi_flash *sbsf, const u8 *rx, sbsf->data->nr_sectors; } else if (sbsf->cmd == CMD_ERASE_4K && (flags & SECT_4K)) { sbsf->erase_size = 4 << 10; - } else if (sbsf->cmd == CMD_ERASE_32K && (flags & SECT_32K)) { - sbsf->erase_size = 32 << 10; - } else if (sbsf->cmd == CMD_ERASE_64K && - !(flags & (SECT_4K | SECT_32K))) { + } else if (sbsf->cmd == CMD_ERASE_64K && !(flags & SECT_4K)) { sbsf->erase_size = 64 << 10; } else { debug(" cmd unknown: %#x\n", sbsf->cmd); |