diff options
Diffstat (limited to 'w29ee011.c')
| -rw-r--r-- | w29ee011.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/w29ee011.c b/w29ee011.c index a570bd6d1..234b865c8 100644 --- a/w29ee011.c +++ b/w29ee011.c @@ -15,9 +15,24 @@ */ #include <string.h> +#include <stdbool.h> + #include "flash.h" #include "chipdrivers.h" +bool w29ee011_can_override(const char *const chip_name, const char *const override_chip) +{ + if (!override_chip || strcmp(override_chip, chip_name)) { + msg_cdbg("Old Winbond W29* probe method disabled because " + "the probing sequence puts the AMIC A49LF040A in " + "a funky state. Use 'flashrom -c %s' if you " + "have a board with such a chip.\n", chip_name); + return false; + } + + return true; +} + /* According to the Winbond W29EE011, W29EE012, W29C010M, W29C011A * datasheets this is the only valid probe function for those chips. */ @@ -26,27 +41,19 @@ int probe_w29ee011(struct flashctx *flash) chipaddr bios = flash->virtual_memory; uint8_t id1, id2; - if (!chip_to_probe || strcmp(chip_to_probe, flash->chip->name)) { - msg_cdbg("Old Winbond W29* probe method disabled because " - "the probing sequence puts the AMIC A49LF040A in " - "a funky state. Use 'flashrom -c %s' if you " - "have a board with such a chip.\n", flash->chip->name); - return 0; - } - /* Issue JEDEC Product ID Entry command */ chip_writeb(flash, 0xAA, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + 0x2AAA); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x80, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0xAA, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + 0x2AAA); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x60, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); /* Read product ID */ id1 = chip_readb(flash, bios); @@ -54,11 +61,11 @@ int probe_w29ee011(struct flashctx *flash) /* Issue JEDEC Product ID Exit command */ chip_writeb(flash, 0xAA, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + 0x2AAA); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0xF0, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); |