openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 06:01:16 +02:00
Code Issues Releases Wiki Activity

cli_classic.c: Convert do_erase() to libflashrom call

Browse Source 
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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/60068
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
This commit is contained in:
Edward O'Callaghan
2021-12-13 12:30:03 +11:00
committed by Edward O'Callaghan
parent f136a2a69c
commit 7a2d7efd83
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cli_classic.c
View File

@ -840,8 +840,18 @@ int main(int argc, char *argv[])
ret = do_read(fill_flash, filename);
else if (extract_it)
ret = do_extract(fill_flash);
else if (erase_it)
ret = do_erase(fill_flash);
else if (erase_it) {
ret = flashrom_flash_erase(fill_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();
}
else if (write_it)
ret = do_write(fill_flash, filename, referencefile);
else if (verify_it)