Make FMC's test-rt memory layout match real RT FW's

chipsalliance · Feb 15, 2024 · 6505bc9 · 6505bc9
1 parent 11edcf3
commit 6505bc9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fmc/test-fw/test-rt/Cargo.toml b/fmc/test-fw/test-rt/Cargo.toml
@@ -16,6 +16,8 @@ ureg.workspace = true
 
 [build-dependencies]
 cfg-if.workspace = true
+caliptra_common = { workspace = true, default-features = false }
+caliptra-gen-linker-scripts.workspace = true
 
 [dev-dependencies]
 caliptra-builder.workspace = true

diff --git a/fmc/test-fw/test-rt/build.rs b/fmc/test-fw/test-rt/build.rs
@@ -6,11 +6,14 @@ fn main() {
             use std::env;
             use std::fs;
             use std::path::PathBuf;
+            use caliptra_gen_linker_scripts::gen_memory_x;
 
             let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
 
-            // Put the linker script somewhere the linker can find it.
-            fs::write(out_dir.join("memory.x"), include_bytes!("memory.x")).unwrap();
+            fs::write(out_dir.join("memory.x"),gen_memory_x(caliptra_common::RUNTIME_ORG, caliptra_common::RUNTIME_SIZE)
+                .as_bytes())
+                .expect("Unable to generate memory.x");
+
             println!("cargo:rustc-link-search={}", out_dir.display());
 
             println!("cargo:rerun-if-changed=memory.x");

diff --git a/fmc/test-fw/test-rt/memory.x b/fmc/test-fw/test-rt/memory.x