diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-02-03 12:52:02 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-02-24 23:03:17 +0000 |
| commit | 2740a52dbd5bf4f32daee76c0c36649b8b547725 (patch) | |
| tree | 812ef4796e5ab0f39a4588dc5b3c0dc4e73ede0f /cli_classic.c | |
| parent | f79618d535084f8c2a41b23279d809e51956972f (diff) | |
| download | flashrom-2740a52dbd5bf4f32daee76c0c36649b8b547725.tar.gz flashrom-2740a52dbd5bf4f32daee76c0c36649b8b547725.tar.bz2 flashrom-2740a52dbd5bf4f32daee76c0c36649b8b547725.zip | |
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
<snip>
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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/61582
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'cli_classic.c')
| -rw-r--r-- | cli_classic.c | 6 |
1 files 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; |