[U-Boot] [PATCH 4/6] sf: Remove SECT_32K
Jagan Teki
jteki at openedev.com
Mon Aug 8 16:01:39 CEST 2016
SECT_32K never used anywhere in the code.
Cc: Simon Glass <sjg at chromium.org>
Cc: Bin Meng <bmeng.cn at gmail.com>
Cc: Michal Simek <michal.simek at xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
Cc: Vignesh R <vigneshr at ti.com>
Cc: Mugunthan V N <mugunthanvnm at ti.com>
Signed-off-by: Jagan Teki <jteki at openedev.com>
---
drivers/mtd/spi/sf_internal.h | 16 +++++++---------
drivers/mtd/spi/spi_flash.c | 3 ---
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 71ba1a6..9eb0b84 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -27,14 +27,13 @@ enum {
#else
SECT_4K = BIT(0),
#endif
- SECT_32K = BIT(1),
- E_FSR = BIT(2),
- SST_WR = BIT(3),
- WR_QPP = BIT(4),
- RD_QUAD = BIT(5),
- RD_DUAL = BIT(6),
- RD_QUADIO = BIT(7),
- RD_DUALIO = BIT(8),
+ E_FSR = BIT(1),
+ SST_WR = BIT(2),
+ WR_QPP = BIT(3),
+ RD_QUAD = BIT(4),
+ RD_DUAL = BIT(5),
+ RD_QUADIO = BIT(6),
+ RD_DUALIO = BIT(7),
};
#define RD_FULL RD_QUAD | RD_DUAL | RD_QUADIO | RD_DUALIO
@@ -57,7 +56,6 @@ enum spi_nor_option_flags {
/* Erase commands */
#define CMD_ERASE_4K 0x20
-#define CMD_ERASE_32K 0x52
#define CMD_ERASE_CHIP 0xc7
#define CMD_ERASE_64K 0xd8
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 041b64f..2b2a409 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -1159,9 +1159,6 @@ int spi_flash_scan(struct spi_flash *flash)
if (params->flags & SECT_4K) {
flash->erase_cmd = CMD_ERASE_4K;
flash->erase_size = 4096 << flash->shift;
- } else if (params->flags & SECT_32K) {
- flash->erase_cmd = CMD_ERASE_32K;
- flash->erase_size = 32768 << flash->shift;
} else {
flash->erase_cmd = CMD_ERASE_64K;
flash->erase_size = flash->sector_size;
--
2.7.4
More information about the U-Boot
mailing list