From 48f1d73b5fc50a909f741d68119bcf02a8f2c331 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Thu, 11 Feb 2010 23:03:53 +0000 Subject: At long last, the day has come, and we can bury full-chip erase once and for all Back in November 2008(!) I proposed the first version of the flexible sector-based erase structure, and now we can finally rip out the old full-chip erase code without ill effects. Rejoice and party! Thanks to everyone who made this possible, especially to Sean Nelson who converted the majority of flash chips to sector erase. Corresponding to flashrom svn r895. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Sean Nelson --- flashrom.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 326f725..3710606 100644 --- a/flashrom.c +++ b/flashrom.c @@ -975,12 +975,6 @@ int erase_flash(struct flashchip *flash) if (!ret) break; } - /* If no block erase function was found or block erase failed, retry. */ - if ((!found || ret) && (flash->erase)) { - found = 1; - printf_debug("Trying whole-chip erase function... "); - ret = flash->erase(flash); - } if (!found) { fprintf(stderr, "ERROR: flashrom has no erase function for this flash chip.\n"); return 1; -- cgit v1.1