From 7a2d7efd83ff50507192bba01dbad1a411e22b25 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 13 Dec 2021 12:30:03 +1100 Subject: cli_classic.c: Convert do_erase() to libflashrom call Inline emergency_help_message() to cli_classic call site. This leaves do_erase() a redudant wrapper and moves us a step closer to cli_classic as a pure libflashrom user by using flashrom_flash_erase(). BUG=b:208132085 TEST=`flashrom -E` Change-Id: I8566164e7dbad69cf478b24208014f10fb99e4d0 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/60068 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Anastasia Klimchuk --- flashrom.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index dd443b934..1cdddab82 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1553,7 +1553,7 @@ static void nonfatal_help_message(void) "https://www.flashrom.org/Contact for details), thanks!\n"); } -static void emergency_help_message(void) +void emergency_help_message(void) { msg_gerr("Your flash chip is in an unknown state.\n"); #if CONFIG_INTERNAL == 1 @@ -2208,23 +2208,6 @@ int do_extract(struct flashctx *const flash) return do_read(flash, NULL); } -int do_erase(struct flashctx *const flash) -{ - const int ret = flashrom_flash_erase(flash); - - /* - * FIXME: Do we really want the scary warning if erase failed? - * After all, after erase the chip is either blank or partially - * blank or it has the old contents. A blank chip won't boot, - * so if the user wanted erase and reboots afterwards, the user - * knows very well that booting won't work. - */ - if (ret) - emergency_help_message(); - - return ret; -} - int do_write(struct flashctx *const flash, const char *const filename, const char *const referencefile) { const size_t flash_size = flash->chip->total_size * 1024; -- cgit v1.2.3