From fcc4f749f355aa3ee48a0d0a13c37adaefbc0f09 Mon Sep 17 00:00:00 2001 From: Sean Nelson <audiohacked@gmail.com> Date: Sat, 20 Mar 2010 03:01:19 +0000 Subject: [PATCH] Fix some problems introduced in commit r948 brought up by carldani The Intel 28F001BX-T/B chips don't have block locks or mention of registers; chip is old. The Intel 28F004S5 mentions block locks which require a remapping registers. Corresponding to flashrom svn r960. The Intel 28F004S5 mentions block locks which require a remapping registers. Fixes problems brought up by carldani because of commit r948. Signed-off-by: Sean Nelson <audiohacked@gmail.com> Acked-by: Sean Nelson <audiohacked@gmail.com> --- flashchips.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flashchips.c b/flashchips.c index 62cd2ae..86c766b 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2316,7 +2316,6 @@ struct flashchip flashchips[] = { .model_id = P28F001BXB, .total_size = 128, .page_size = 128 * 1024, /* 8k + 2x4k + 112k */ - .feature_bits = 0, .tested = TEST_BAD_WRITE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ @@ -2331,7 +2330,6 @@ struct flashchip flashchips[] = { .block_erase = erase_block_82802ab, }, }, - .unlock = unlock_82802ab, .write = NULL, .read = read_memmapped, }, @@ -2344,7 +2342,6 @@ struct flashchip flashchips[] = { .model_id = P28F001BXT, .total_size = 128, .page_size = 128 * 1024, /* 112k + 2x4k + 8k */ - .feature_bits = 0, .tested = TEST_BAD_WRITE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ @@ -2359,7 +2356,6 @@ struct flashchip flashchips[] = { .block_erase = erase_block_82802ab, }, }, - .unlock = unlock_82802ab, .write = NULL, .read = read_memmapped, }, @@ -2372,6 +2368,7 @@ struct flashchip flashchips[] = { .model_id = E_28F004S5, .total_size = 512, .page_size = 256, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ -- GitLab