From 1a9441f7487aea5b2a03e6aa88157261c5c2ba9b Mon Sep 17 00:00:00 2001 From: Daniel Campello Date: Tue, 27 Apr 2021 08:49:19 -0600 Subject: 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 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/+/2851658 Original-Reviewed-by: Edward O'Callaghan (cherry picked from commit 2e2a5e449229e9c9604235a98b56e5dd29bf25cf) Change-Id: Ib329f3adb59ce1848d1540844d64b968f49eb22a Reviewed-on: https://review.coreboot.org/c/flashrom/+/52890 Reviewed-by: Peter Marheine Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- util/flashrom_tester/flashrom/src/cmd.rs | 6 +----- util/flashrom_tester/flashrom/src/lib.rs | 7 ++----- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'util/flashrom_tester') diff --git a/util/flashrom_tester/flashrom/src/cmd.rs b/util/flashrom_tester/flashrom/src/cmd.rs index 8775ed44..37f8a72f 100644 --- a/util/flashrom_tester/flashrom/src/cmd.rs +++ b/util/flashrom_tester/flashrom/src/cmd.rs @@ -129,9 +129,6 @@ fn flashrom_decode_opts(opts: FlashromOpt) -> Vec { 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 @@ mod tests { 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 734e3ff4..75797d39 100644 --- a/util/flashrom_tester/flashrom/src/lib.rs +++ b/util/flashrom_tester/flashrom/src/lib.rs @@ -91,9 +91,8 @@ pub struct FlashromOpt<'a> { pub layout: Option<&'a str>, // -l pub image: Option<&'a str>, // -i - 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 @@ pub fn write_file_with_layout( layout: rws.layout_file, image: rws.name_file, - ignore_fmap: true, - ..Default::default() }; -- cgit v1.2.3