summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroccochen@chromium.com <roccochen@chromium.org>2023-11-27 15:06:43 +0800
committerEdward O'Callaghan <quasisec@chromium.org>2023-12-21 22:38:32 +0000
commit5106287e22d1889c990422f79ddb2df70a137b98 (patch)
treeb8360da540107fde07c55dad884940bc2bb7c680
parent8ac3574fc6c48d8cac0a90903a4bd64273d531b2 (diff)
downloadflashrom-5106287e22d1889c990422f79ddb2df70a137b98.tar.gz
flashrom-5106287e22d1889c990422f79ddb2df70a137b98.tar.bz2
flashrom-5106287e22d1889c990422f79ddb2df70a137b98.zip
flashrom_tester: Drop technical debt
Drop `-p host` ChromeOS miss-feature and use `-p internal` instead. BUG=b:296978620 BRANCH=none TEST=run flashrom-tester with newer flashrom Change-Id: I1ea174c1760fee3e41a2ef0e9779badf0c51298d Signed-off-by: roccochen@chromium.com <roccochen@chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/79303 Reviewed-by: Evan Benn <evanbenn@gmail.com> Reviewed-by: David Wu <david_wu@quanta.corp-partner.google.com> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Nick Vaccaro <nvaccaro@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Bob Moragues <moragues@google.com>
-rw-r--r--util/flashrom_tester/flashrom/src/lib.rs8
-rw-r--r--util/flashrom_tester/src/main.rs2
-rw-r--r--util/flashrom_tester/src/tests.rs4
3 files changed, 7 insertions, 7 deletions
diff --git a/util/flashrom_tester/flashrom/src/lib.rs b/util/flashrom_tester/flashrom/src/lib.rs
index 41393e841..e2c91499e 100644
--- a/util/flashrom_tester/flashrom/src/lib.rs
+++ b/util/flashrom_tester/flashrom/src/lib.rs
@@ -51,19 +51,19 @@ pub use libflashrom::{
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub enum FlashChip {
- HOST,
+ INTERNAL,
}
impl FlashChip {
pub fn from(s: &str) -> Result<FlashChip, &str> {
match s {
- "host" => Ok(FlashChip::HOST),
+ "internal" => Ok(FlashChip::INTERNAL),
_ => Err("cannot convert str to enum"),
}
}
pub fn to(fc: FlashChip) -> &'static str {
match fc {
- FlashChip::HOST => "host",
+ FlashChip::INTERNAL => "internal",
}
}
@@ -80,7 +80,7 @@ impl FlashChip {
/// disabled.
pub fn can_control_hw_wp(&self) -> bool {
match self {
- FlashChip::HOST => true,
+ FlashChip::INTERNAL => true,
}
}
}
diff --git a/util/flashrom_tester/src/main.rs b/util/flashrom_tester/src/main.rs
index b8a2581ac..3035ae5f3 100644
--- a/util/flashrom_tester/src/main.rs
+++ b/util/flashrom_tester/src/main.rs
@@ -82,7 +82,7 @@ fn main() {
.arg(
Arg::with_name("ccd_target_type")
.required(true)
- .possible_values(&["host"]),
+ .possible_values(&["internal"]),
)
.arg(
Arg::with_name("print-layout")
diff --git a/util/flashrom_tester/src/tests.rs b/util/flashrom_tester/src/tests.rs
index 721a789d5..d1e9d6194 100644
--- a/util/flashrom_tester/src/tests.rs
+++ b/util/flashrom_tester/src/tests.rs
@@ -219,8 +219,8 @@ fn hwwp_locks_swwp_test(env: &mut TestEnv) -> TestResult {
/// is actually able to write to the Flash. This only makes sense for chips
/// running Coreboot, which we assume is just host.
fn elog_sanity_test(env: &mut TestEnv) -> TestResult {
- if env.chip_type() != FlashChip::HOST {
- info!("Skipping ELOG sanity check for non-host chip");
+ if env.chip_type() != FlashChip::INTERNAL {
+ info!("Skipping ELOG sanity check for non-internal chip");
return Ok(());
}
// flash should be back in the golden state