diff options
author | Edward O'Callaghan <quasisec@google.com> | 2021-11-15 15:47:15 +1100 |
---|---|---|
committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-05-13 02:34:43 +0000 |
commit | 086f0c8e4f32ade9c80f2a8b2889ce870467c398 (patch) | |
tree | f6adb49152812bbb232ccecc6ab33b70ae1bf247 /cli_classic.c | |
parent | f3d09b5997a80a833b4a44ff922a132e8086556f (diff) | |
download | flashrom-086f0c8e4f32ade9c80f2a8b2889ce870467c398.tar.gz flashrom-086f0c8e4f32ade9c80f2a8b2889ce870467c398.tar.bz2 flashrom-086f0c8e4f32ade9c80f2a8b2889ce870467c398.zip |
flashrom: Drop read_flash_to_file() usage
Aspire towards a goal of making cli_classic more of just
a user of libflashrom than having quasi-parallel paths in
flashrom.c
This converts remaining read_flash_to_file() usage to the
do_read() provider wrapper around libflashrom.
BUG=b:208132085
TEST=`
sudo ./flashrom -p ft2232_spi:type=232H,divisor=1000 -f -r out -c W25X05
Flashrom output:
No EEPROM/flash device found.
Force read (-f -r -c) requested, pretending the chip is there:
Assuming Winbond flash chip "W25X05" (64 kB, SPI) on ft2232_spi.
Please note that forced reads most likely contain garbage.
Block protection could not be disabled!
Reading flash... done.
Data read:
xxd out-1khz
00000000: 0000 07ff ffff e000 0000 7fff fffe 0000 ................
00000010: 0007 ffff ffe0 0000 007f ffff fe00 0000 ................
00000020: 07ff ffff e000 0000 7fff fffe 0000 0007 ................
00000030: ffff ffe0 0000 007f ffff fe00 0000 0fff ................
xxd out-100khz
00000000: b6db 6db6 db6d b6db 6db6 db6d b6db 6db6 ..m..m..m..m..m.
00000010: db6d b6db 6db6 db6d b6db 6db6 db6d b6db .m..m..m..m..m..
00000020: 6db6 db6d b6db 6db6 db24 9249 2492 4924 m..m..m..$.I$.I$
00000030: 9249 2492 4924 9249 2492 4924 9249 2492 .I$.I$.I$.I$.I$.
`
Change-Id: I4b690b688acf9d5deb46e8642a252a2132ea8c73
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Tested-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/59291
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Diffstat (limited to 'cli_classic.c')
-rw-r--r-- | cli_classic.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cli_classic.c b/cli_classic.c index a0c18d4e7..954300985 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -916,14 +916,9 @@ int main(int argc, char *argv[]) ret = 1; goto out_shutdown; } - if (map_flash(&flashes[0]) != 0) { - free(flashes[0].chip); - ret = 1; - goto out_shutdown; - } msg_cinfo("Please note that forced reads most likely contain garbage.\n"); - ret = read_flash_to_file(&flashes[0], filename); - unmap_flash(&flashes[0]); + flashrom_flag_set(&flashes[0], FLASHROM_FLAG_FORCE, !!force); + ret = do_read(&flashes[0], filename); free(flashes[0].chip); goto out_shutdown; } |