From d7a08466aed548f01666fd151533a2d3ab8de435 Mon Sep 17 00:00:00 2001 From: Tim Trippel Date: Thu, 7 Mar 2024 22:24:10 -0800 Subject: [PATCH] [rom_e2e] fix ROM e2e test after removing 64k slot size limit Signed-off-by: Tim Trippel --- .../tests/rom/e2e_bootstrap_entry/src/main.rs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs b/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs index 4f60f68c3ddc2..5b4a1cef6e7f4 100644 --- a/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs +++ b/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs @@ -412,8 +412,8 @@ fn test_bootstrap_phase1_erase( // Remove strapping so that chip fails to boot instead of going into bootstrap. transport.pin_strapping("ROM_BOOTSTRAP")?.remove()?; transport.reset_target(opts.init.bootstrap.options.reset_delay, true)?; - // `kErrorBootPolicyBadLength` (0242500d) is defined in `error.h`. - console.exit_success = Some(Regex::new("BFV:0242500d")?); + // `kErrorManifestBadVersionMajor` (054d410d) is defined in `error.h`. + console.exit_success = Some(Regex::new("BFV:054d410d")?); let result = console.interact(&*uart, None, Some(&mut std::io::stdout()))?; if result != ExitStatus::ExitSuccess { bail!("FAIL: {:?}", result); @@ -426,8 +426,8 @@ fn test_bootstrap_phase1_erase( uart.clear_rx_buffer()?; transport.pin_strapping("ROM_BOOTSTRAP")?.remove()?; transport.reset_target(opts.init.bootstrap.options.reset_delay, true)?; - // `kErrorBootPolicyBadIdentifier` (0142500d) is defined in `error.h`. - console.exit_success = Some(Regex::new("BFV:0142500d")?); + // `kErrorManifestBadVersionMajor` (054d410d) is defined in `error.h`. + console.exit_success = Some(Regex::new("BFV:054d410d")?); let result = console.interact(&*uart, None, Some(&mut std::io::stdout()))?; if result != ExitStatus::ExitSuccess { bail!("FAIL: {:?}", result); @@ -454,8 +454,8 @@ fn test_bootstrap_phase1_read(opts: &Opts, transport: &TransportWrapper) -> Resu // Remove strapping so that chip fails to boot instead of going into bootstrap. transport.pin_strapping("ROM_BOOTSTRAP")?.remove()?; transport.reset_target(opts.init.bootstrap.options.reset_delay, true)?; - // `kErrorBootPolicyBadLength` (0242500d) is defined in `error.h`. - console.exit_success = Some(Regex::new("0242500d")?); + // `kErrorManifestBadVersionMajor` (054d410d) is defined in `error.h`. + console.exit_success = Some(Regex::new("BFV:054d410d")?); let result = console.interact(&*uart, None, Some(&mut std::io::stdout()))?; if result != ExitStatus::ExitSuccess { bail!("FAIL: {:?}", result); @@ -518,8 +518,8 @@ fn test_bootstrap_phase2_page_program(opts: &Opts, transport: &TransportWrapper) let mut console = UartConsole { timeout: Some(Duration::new(1, 0)), - // `kErrorBootPolicyBadLength` (0242500d) is defined in `error.h`. - exit_success: Some(Regex::new("BFV:0242500d\r\n")?), + // `kErrorManifestBadVersionMajor` (054d410d) is defined in `error.h`. + exit_success: Some(Regex::new("BFV:054d410d\r\n")?), ..Default::default() }; // Remove strapping so that chip fails to boot instead of going into bootstrap. @@ -592,8 +592,8 @@ fn test_bootstrap_phase2_read(opts: &Opts, transport: &TransportWrapper) -> Resu let mut console = UartConsole { timeout: Some(Duration::new(1, 0)), - // `kErrorBootPolicyBadLength` (0242500d) is defined in `error.h`. - exit_success: Some(Regex::new("BFV:0242500d\r\n")?), + // `kErrorManifestBadVersionMajor` (054d410d) is defined in `error.h`. + exit_success: Some(Regex::new("BFV:054d410d\r\n")?), ..Default::default() }; // Remove strapping so that chip fails to boot instead of going into bootstrap.