diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-10-17 15:00:57 +1100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-11-10 17:23:07 +0000 |
| commit | 00635b0da2c223717c353e7a5cf73d7f900896cd (patch) | |
| tree | 28409c64a4b48b8e63c47beaeaef038c742b0fb5 /linux_mtd.c | |
| parent | 664c58f32af45b2acf7520c05bb40ef2c2f0891e (diff) | |
| download | flashrom-00635b0da2c223717c353e7a5cf73d7f900896cd.tar.gz flashrom-00635b0da2c223717c353e7a5cf73d7f900896cd.tar.bz2 flashrom-00635b0da2c223717c353e7a5cf73d7f900896cd.zip | |
Revert "libflashrom: Return progress state to the library user"
This reverts commit 40892b0c08fbc8029921e91511dd3f91fc956f90.
The feature of returning progress for libflashrom users was
introduced in original commit, however later a bug was found and
reported as https://ticket.coreboot.org/issues/390.
Reverting in a release branch to unblock release candidate, since
it is unknown how much time needed to fix the bug. Meanwhile the
feature remains in a master branch and will be fixed under
ticket 390.
TEST=scenarios below run successfully
1) flashrom -h does not show --progress
2) flashrom -p dummy:emulate=W25Q128FV -r /tmp/dump.bin
3) flashrom -p dummy:emulate=W25Q128FV -v /tmp/dump.bin
4) flashrom -p dummy:emulate=W25Q128FV -E
5) head -c 16777216 </dev/urandom >/tmp/image.bin
flashrom -p dummy:image=/tmp/image.bin,emulate=W25Q128FV \
-w /tmp/dump.bin
Change-Id: Id3d7ffcaf266a60a44eb453fd09b7c63c05349c2
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/69283
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'linux_mtd.c')
| -rw-r--r-- | linux_mtd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linux_mtd.c b/linux_mtd.c index b8aee0616..5a1360e95 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -215,7 +215,6 @@ static int linux_mtd_read(struct flashctx *flash, uint8_t *buf, } i += step; - update_progress(flash, FLASHROM_PROGRESS_READ, i, len); } return 0; @@ -258,7 +257,6 @@ static int linux_mtd_write(struct flashctx *flash, const uint8_t *buf, } i += step; - update_progress(flash, FLASHROM_PROGRESS_WRITE, i, len); } return 0; @@ -295,7 +293,6 @@ static int linux_mtd_erase(struct flashctx *flash, __func__, ret, strerror(errno)); return 1; } - update_progress(flash, FLASHROM_PROGRESS_ERASE, u + data->erasesize, len); } return 0; |