From 8b0250b32b89a54df16989369c0cb8330d86cb77 Mon Sep 17 00:00:00 2001 From: Nikolai Artemiev Date: Wed, 23 Nov 2022 10:17:56 +1100 Subject: flashrom_tester: Drop dediprog, ec, and servo targets None of these targets have been maintained or used for several years: dediprog: - Wasn't accepted by the argument filter in main.rs. ec: - Is incompatible with most tests because the EC only supports one protection range. servo: - Has been broken for >3 years because it uses the programmer string "ft2231_spi:type=servo-v2", where "ft2231" should be "ft2232". BUG=b:239357853 BRANCH=none TEST=flashrom_tester on dedede Change-Id: Iee94f6bb5ff8c5451acb8bcaabf28119006d0ef5 Signed-off-by: Nikolai Artemiev Reviewed-on: https://review.coreboot.org/c/flashrom/+/69921 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- util/flashrom_tester/src/main.rs | 2 +- util/flashrom_tester/src/tester.rs | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'util/flashrom_tester/src') diff --git a/util/flashrom_tester/src/main.rs b/util/flashrom_tester/src/main.rs index 129d1a9b..44429ba8 100644 --- a/util/flashrom_tester/src/main.rs +++ b/util/flashrom_tester/src/main.rs @@ -83,7 +83,7 @@ fn main() { .arg( Arg::with_name("ccd_target_type") .required(true) - .possible_values(&["host", "ec", "servo"]), + .possible_values(&["host"]), ) .arg( Arg::with_name("print-layout") diff --git a/util/flashrom_tester/src/tester.rs b/util/flashrom_tester/src/tester.rs index 1fa44a84..4629c2eb 100644 --- a/util/flashrom_tester/src/tester.rs +++ b/util/flashrom_tester/src/tester.rs @@ -96,19 +96,10 @@ impl<'a> TestEnv<'a> { } pub fn run_test(&mut self, test: T) -> TestResult { - let use_dut_control = self.chip_type == FlashChip::SERVO; - if use_dut_control && flashrom::dut_ctrl_toggle_wp(false).is_err() { - error!("failed to dispatch dut_ctrl_toggle_wp()!"); - } - let name = test.get_name(); info!("Beginning test: {}", name); let out = test.run(self); info!("Completed test: {}; result {:?}", name, out); - - if use_dut_control && flashrom::dut_ctrl_toggle_wp(true).is_err() { - error!("failed to dispatch dut_ctrl_toggle_wp()!"); - } out } -- cgit v1.2.3