Deprecate FMC's test-fw crate.

chipsalliance · Mar 12, 2024 · 2dfcf87 · 2dfcf87
1 parent cddb376
commit 2dfcf87
Show file tree

Hide file tree

Showing 12 changed files with 188 additions and 377 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,6 @@ members = [
   "drivers/test-fw",
   "drivers/test-fw/scripts/vector_gen",
   "fmc",
-  "fmc/test-fw/test-rt",
   "hw/1.0/registers",
   "hw/latest/registers",
   "hw/verilated",

diff --git a/builder/src/firmware.rs b/builder/src/firmware.rs
@@ -339,21 +339,6 @@ pub mod rom_tests {
     };
 }
 
-pub mod fmc_tests {
-    use super::*;
-
-    pub const MOCK_RT_WITH_UART: FwId = FwId {
-        crate_name: "caliptra-fmc-mock-rt",
-        bin_name: "caliptra-fmc-mock-rt",
-        features: &["emu"],
-    };
-    pub const MOCK_RT_INTERACTIVE: FwId = FwId {
-        crate_name: "caliptra-fmc-mock-rt",
-        bin_name: "caliptra-fmc-mock-rt",
-        features: &["emu", "interactive_test"],
-    };
-}
-
 pub mod runtime_tests {
     use super::*;
 
@@ -377,6 +362,11 @@ pub mod runtime_tests {
         bin_name: "persistent_rt",
         ..RUNTIME_TEST_FWID_BASE
     };
+
+    pub const MOCK_RT_INTERACTIVE: FwId = FwId {
+        bin_name: "mock_rt_interact",
+        ..RUNTIME_TEST_FWID_BASE
+    };
 }
 
 pub const REGISTERED_FW: &[&FwId] = &[
@@ -434,9 +424,8 @@ pub const REGISTERED_FW: &[&FwId] = &[
     &rom_tests::TEST_FMC_INTERACTIVE,
     &rom_tests::FAKE_TEST_FMC_INTERACTIVE,
     &rom_tests::TEST_RT_WITH_UART,
-    &fmc_tests::MOCK_RT_WITH_UART,
-    &fmc_tests::MOCK_RT_INTERACTIVE,
     &runtime_tests::BOOT,
     &runtime_tests::MBOX,
     &runtime_tests::PERSISTENT_RT,
+    &runtime_tests::MOCK_RT_INTERACTIVE,
 ];
diff --git a/fmc/test-fw/test-rt/Cargo.toml b/fmc/test-fw/test-rt/Cargo.toml
diff --git a/fmc/test-fw/test-rt/build.rs b/fmc/test-fw/test-rt/build.rs
diff --git a/fmc/test-fw/test-rt/src/interactive_test.rs b/fmc/test-fw/test-rt/src/interactive_test.rs