Remove FEATURE_ADDR_SHIFTED as well as FEATURE_*_RESET from chips
that don't use them.
Signed-off-by: Stefan Tauner <stefan.tau...@alumni.tuwien.ac.at>
---
flash.h | 8 ++++----
flashchips.c | 9 +--------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/flash.h b/flash.h
index 7949628..d3ffced 100644
--- a/flash.h
+++ b/flash.h
@@ -104,14 +104,14 @@ enum write_granularity {
/* Feature bits used for non-SPI only */
#define FEATURE_REGISTERMAP (1 << 0)
#define FEATURE_BYTEWRITES (1 << 1)
+#define FEATURE_ADDR_FULL (0 << 2)
+#define FEATURE_ADDR_2AA (1 << 2)
+#define FEATURE_ADDR_AAA (2 << 2)
+#define FEATURE_ADDR_MASK (3 << 2)
#define FEATURE_LONG_RESET (0 << 4)
#define FEATURE_SHORT_RESET (1 << 4)
#define FEATURE_EITHER_RESET FEATURE_LONG_RESET
#define FEATURE_RESET_MASK (FEATURE_LONG_RESET | FEATURE_SHORT_RESET)
-#define FEATURE_ADDR_FULL (0 << 2)
-#define FEATURE_ADDR_MASK (3 << 2)
-#define FEATURE_ADDR_2AA (1 << 2)
-#define FEATURE_ADDR_AAA (2 << 2)
#define FEATURE_ADDR_SHIFTED (1 << 5)
/* Feature bits used for SPI only */
#define FEATURE_WRSR_EWSR (1 << 6)
diff --git a/flashchips.c b/flashchips.c
index 0c3bb68..2efcd26 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -4892,7 +4892,6 @@ const struct flashchip flashchips[] = {
.model_id = FUJITSU_MBM29F400BC,
.total_size = 512,
.page_size = 64 * 1024,
- .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET,
.tested = TEST_UNTESTED,
.probe = probe_m29f400bt,
.probe_timing = TIMING_IGNORED, /* routine doesn't use
probe_timing (m29f400bt.c) */
@@ -4924,7 +4923,6 @@ const struct flashchip flashchips[] = {
.model_id = FUJITSU_MBM29F400TC,
.total_size = 512,
.page_size = 64 * 1024,
- .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET,
.tested = TEST_UNTESTED,
.probe = probe_m29f400bt,
.probe_timing = TIMING_IGNORED, /* routine doesn't use
probe_timing (m29f400bt.c) */
@@ -4956,7 +4954,6 @@ const struct flashchip flashchips[] = {
.model_id = FUJITSU_MBM29LV160BE,
.total_size = 2 * 1024,
.page_size = 0,
- .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_SHORT_RESET,
.tested = TEST_UNTESTED,
.probe = probe_m29f400bt,
.probe_timing = TIMING_IGNORED,
@@ -4988,7 +4985,6 @@ const struct flashchip flashchips[] = {
.model_id = FUJITSU_MBM29LV160TE,
.total_size = 2 * 1024,
.page_size = 0,
- .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_SHORT_RESET,
.tested = TEST_UNTESTED,
.probe = probe_m29f400bt,
.probe_timing = TIMING_IGNORED,
@@ -9439,7 +9435,7 @@ const struct flashchip flashchips[] = {
.model_id = SHARP_LHF00L04,
.total_size = 1024,
.page_size = 64 * 1024,
- .feature_bits = FEATURE_EITHER_RESET | FEATURE_REGISTERMAP,
+ .feature_bits = FEATURE_REGISTERMAP,
.tested = TEST_UNTESTED,
.probe = probe_82802ab,
.probe_timing = TIMING_ZERO,
@@ -11388,7 +11384,6 @@ const struct flashchip flashchips[] = {
.model_id = ST_M29F400BB,
.total_size = 512,
.page_size = 64 * 1024,
- .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET,
.tested = TEST_UNTESTED,
.probe = probe_m29f400bt,
.probe_timing = TIMING_IGNORED, /* routine doesn't use
probe_timing (m29f400bt.c) */
@@ -11420,7 +11415,6 @@ const struct flashchip flashchips[] = {
.model_id = ST_M29F400BT,
.total_size = 512,
.page_size = 64 * 1024,
- .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET,
.tested = TEST_UNTESTED,
.probe = probe_m29f400bt,
.probe_timing = TIMING_IGNORED, /* routine doesn't use
probe_timing (m29f400bt.c) */
@@ -12780,7 +12774,6 @@ const struct flashchip flashchips[] = {
.model_id = WINBOND_W29C010,
.total_size = 128,
.page_size = 128,
- .feature_bits = FEATURE_LONG_RESET,
.tested = TEST_OK_PREW,
.probe = probe_w29ee011,
.probe_timing = TIMING_IGNORED, /* routine doesn't use
probe_timing (w29ee011.c) */
--
Kind regards, Stefan Tauner
_______________________________________________
flashrom mailing list
flashrom@flashrom.org
http://www.flashrom.org/mailman/listinfo/flashrom
