From 2740a52dbd5bf4f32daee76c0c36649b8b547725 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 3 Feb 2022 12:52:02 +1100 Subject: cli_classic: Use flashrom_init() from API flashrom_init() already does delay calibration and self-checking via the canonical libflashrom API. Port the cli implementation to go via the libflashrom API entry-point natively. BUG=b:208132085 TEST=```sudo ./flashrom -p internal --flash-size Found Programmer flash chip "Opaque flash chip" (16384 kB, Programmer-specific) mapped at physical address 0x0000000000000000. 16777216 ``` Change-Id: I07faeed876f678c35355621a080c7852eed16824 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/61582 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Anastasia Klimchuk Reviewed-by: Angel Pons --- cli_classic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 4a5f298b1..317172c76 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -350,7 +350,8 @@ int main(int argc, char *argv[]) print_version(); print_banner(); - if (selfcheck()) + /* FIXME: Delay calibration should happen in programmer code. */ + if (flashrom_init(1)) exit(1); setbuf(stdout, NULL); @@ -661,9 +662,6 @@ int main(int argc, char *argv[]) } } - /* FIXME: Delay calibration should happen in programmer code. */ - myusec_calibrate_delay(); - if (programmer_init(prog, pparam)) { msg_perr("Error: Programmer initialization failed.\n"); ret = 1; -- cgit v1.2.3