From 0ba785d9cad45acc96355f2d578b4123ef6811f4 Mon Sep 17 00:00:00 2001
From: Anthony Rocha <anthony.rocha@amd.com>
Date: Tue, 28 Jan 2025 10:55:48 -0800
Subject: [PATCH] Revert changes to strings.

---
 runtime/src/main.rs                               | 15 +++++++++++----
 .../fake_collateral_boot_test.rs                  |  9 ++++++++-
 .../caliptra_integration_tests/smoke_test.rs      | 14 +++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/runtime/src/main.rs b/runtime/src/main.rs
index 8558a5cf92..6c844d30e6 100644
--- a/runtime/src/main.rs
+++ b/runtime/src/main.rs
@@ -28,7 +28,14 @@ use core::hint::black_box;
 #[cfg(feature = "std")]
 pub fn main() {}
 
-const BANNER: &str = r#"Caliptra RT"#;
+const BANNER: &str = r#"
+  ____      _ _       _               ____ _____
+ / ___|__ _| (_)_ __ | |_ _ __ __ _  |  _ \_   _|
+| |   / _` | | | '_ \| __| '__/ _` | | |_) || |
+| |__| (_| | | | |_) | |_| | | (_| | |  _ < | |
+ \____\__,_|_|_| .__/ \__|_|  \__,_| |_| \_\|_|
+               |_|
+"#;
 
 #[no_mangle]
 #[allow(clippy::empty_loop)]
@@ -72,15 +79,15 @@ pub extern "C" fn entry_point() -> ! {
     }
 
     drivers.run_reset_flow().unwrap_or_else(|e| {
-        cprintln!("[rt] failed reset flow");
+        cprintln!("[rt] Runtime failed reset flow");
         handle_fatal_error(e.into());
     });
 
     if !drivers.persistent_data.get().fht.is_valid() {
-        cprintln!("[rt] can't load FHT");
+        cprintln!("[rt] Runtime can't load FHT");
         handle_fatal_error(caliptra_drivers::CaliptraError::RUNTIME_HANDOFF_FHT_NOT_LOADED.into());
     }
-    cprintln!("[rt] listening for commands...");
+    cprintln!("[rt] Runtime listening for mailbox commands...");
     if let Err(e) = caliptra_runtime::handle_mailbox_commands(&mut drivers) {
         handle_fatal_error(e.into());
     }
diff --git a/test/tests/caliptra_integration_tests/fake_collateral_boot_test.rs b/test/tests/caliptra_integration_tests/fake_collateral_boot_test.rs
index ecb6eaba6c..7460870fe7 100755
--- a/test/tests/caliptra_integration_tests/fake_collateral_boot_test.rs
+++ b/test/tests/caliptra_integration_tests/fake_collateral_boot_test.rs
@@ -93,7 +93,14 @@ fn fake_boot_test() {
     assert_output_contains(&output, "Running Caliptra ROM");
     assert_output_contains(&output, "[fake-rom-cold-reset]");
     assert_output_contains(&output, "Running Caliptra FMC");
-    assert_output_contains(&output, r#"Caliptra RT"#);
+    assert_output_contains(
+        &output,
+        r#"
+ / ___|__ _| (_)_ __ | |_ _ __ __ _  |  _ \_   _|
+| |   / _` | | | '_ \| __| '__/ _` | | |_) || |
+| |__| (_| | | | |_) | |_| | | (_| | |  _ < | |
+ \____\__,_|_|_| .__/ \__|_|  \__,_| |_| \_\|_|"#,
+    );
 
     let payload = MailboxReqHeader {
         chksum: caliptra_common::checksum::calc_checksum(u32::from(CommandId::GET_LDEV_CERT), &[]),
diff --git a/test/tests/caliptra_integration_tests/smoke_test.rs b/test/tests/caliptra_integration_tests/smoke_test.rs
index bf7a4bfdef..ec0207dcbe 100644
--- a/test/tests/caliptra_integration_tests/smoke_test.rs
+++ b/test/tests/caliptra_integration_tests/smoke_test.rs
@@ -235,8 +235,9 @@ fn smoke_test() {
     .unwrap();
 
     if firmware::rom_from_env() == &firmware::ROM_WITH_UART {
-        hw.step_until_output_contains("[rt] listening for commands...\n")
+        hw.step_until_output_contains("[rt] Runtime listening for mailbox commands...\n")
             .unwrap();
+
         let output = hw.output().take(usize::MAX);
         assert_output_contains(&output, "Running Caliptra ROM");
         assert_output_contains(&output, "[cold-reset]");
@@ -250,7 +251,14 @@ fn smoke_test() {
         assert_output_contains(&output, "[kat] LMS");
         assert_output_contains(&output, "[kat] --");
         assert_output_contains(&output, "Running Caliptra FMC");
-        assert_output_contains(&output, r#"Caliptra RT"#);
+        assert_output_contains(
+            &output,
+            r#"
+ / ___|__ _| (_)_ __ | |_ _ __ __ _  |  _ \_   _|
+| |   / _` | | | '_ \| __| '__/ _` | | |_) || |
+| |__| (_| | | | |_) | |_| | | (_| | |  _ < | |
+ \____\__,_|_|_| .__/ \__|_|  \__,_| |_| \_\|_|"#,
+        );
     }
 
     let ldev_cert_resp = hw.mailbox_execute_req(GetLdevCertReq::default()).unwrap();
@@ -781,7 +789,7 @@ fn test_rt_wdt_timeout() {
     hw.step_until_boot_status(RUNTIME_BOOT_STATUS_READY, true);
     let fmc_target = hw.output().sink().now();
 
-    let rt_wdt_timeout_cycles = fmc_target - wdt_start - 2_000;
+    let rt_wdt_timeout_cycles = fmc_target - wdt_start - 5_000;
     drop(hw);
 
     let security_state = *caliptra_hw_model::SecurityState::default().set_debug_locked(true);