Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/52890 )
Change subject: CHROMIUM: flashrom_tester: Remove --ignore-fmap option ......................................................................
CHROMIUM: flashrom_tester: Remove --ignore-fmap option
This change removes --ignore-fmap as this is implicitly computed based on other supplied options by the user.
Original-Signed-off-by: Daniel Campello campello@chromium.org Original-Cq-Depend: chromium:2854174, chrome-internal:3789445, chromium:2854014 Original-Change-Id: I841a56d8726644cedd7d616ddfd5656b92dd7e59 Original-Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+... Original-Reviewed-by: Edward O'Callaghan quasisec@chromium.org (cherry picked from commit 2e2a5e449229e9c9604235a98b56e5dd29bf25cf) Change-Id: Ib329f3adb59ce1848d1540844d64b968f49eb22a Reviewed-on: https://review.coreboot.org/c/flashrom/+/52890 Reviewed-by: Peter Marheine pmarheine@chromium.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M util/flashrom_tester/flashrom/src/cmd.rs M util/flashrom_tester/flashrom/src/lib.rs 2 files changed, 3 insertions(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve
diff --git a/util/flashrom_tester/flashrom/src/cmd.rs b/util/flashrom_tester/flashrom/src/cmd.rs index 8775ed4..37f8a72 100644 --- a/util/flashrom_tester/flashrom/src/cmd.rs +++ b/util/flashrom_tester/flashrom/src/cmd.rs @@ -129,9 +129,6 @@ if opts.flash_name { params.push("--flash-name".to_string()); } - if opts.ignore_fmap { - params.push("--ignore-fmap".to_string()); - } if opts.verbose { params.push("-V".to_string()); } @@ -325,11 +322,10 @@ assert_eq!( flashrom_decode_opts(FlashromOpt { flash_name: true, - ignore_fmap: true, verbose: true, ..Default::default() }), - &["--flash-name", "--ignore-fmap", "-V"] + &["--flash-name", "-V"] ); }
diff --git a/util/flashrom_tester/flashrom/src/lib.rs b/util/flashrom_tester/flashrom/src/lib.rs index 734e3ff..75797d3 100644 --- a/util/flashrom_tester/flashrom/src/lib.rs +++ b/util/flashrom_tester/flashrom/src/lib.rs @@ -91,9 +91,8 @@ pub layout: Option<&'a str>, // -l <file> pub image: Option<&'a str>, // -i <name>
- pub flash_name: bool, // --flash-name - pub ignore_fmap: bool, // --ignore-fmap - pub verbose: bool, // -V + pub flash_name: bool, // --flash-name + pub verbose: bool, // -V }
#[derive(Default)] @@ -183,8 +182,6 @@ layout: rws.layout_file, image: rws.name_file,
- ignore_fmap: true, - ..Default::default() };