Split caliptra-registers into caliptra-registers-latest.

This is in preparation for a future caliptra-registers-1.0 crate.
chipsalliance · Feb 26, 2024 · 8da1f3d · 8da1f3d
1 parent fb5dde1
commit 8da1f3d
Show file tree

Hide file tree

Showing 25 changed files with 902 additions and 874 deletions.
diff --git a/.github/workflows/build-test-verilator.yml b/.github/workflows/build-test-verilator.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: Check that generated register code matches caliptra-rtl submodule
         run: |
-          cargo run --locked -p caliptra_registers_generator -- --check hw/latest/rtl registers/bin/extra-rdl  registers/src
+          cargo run --locked -p caliptra_registers_generator -- --check hw/latest/rtl registers/bin/extra-rdl  hw/latest/registers/src
 
       - name: Build
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,6 +39,7 @@ members = [
   "drivers/test-fw/scripts/vector_gen",
   "fmc",
   "fmc/test-fw/test-rt",
+  "hw/latest/registers",
   "hw/verilated",
   "hw-model",
   "hw-model/test-fw",
@@ -120,6 +121,7 @@ caliptra-image-verify = { path = "image/verify", default-features = false }
 caliptra-kat = { path = "kat" }
 caliptra-lms-types = { path = "lms-types" }
 caliptra-registers = { path = "registers" }
+caliptra-registers-latest = { path = "hw/latest/registers" }
 caliptra-runtime = { path = "runtime", default-features = false }
 caliptra-systemrdl = { path = "systemrdl" }
 caliptra-test = { path = "test" }

diff --git a/hw/latest/registers/Cargo.toml b/hw/latest/registers/Cargo.toml
@@ -0,0 +1,11 @@
+# Licensed under the Apache-2.0 license.
+
+[package]
+name = "caliptra-registers-latest"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+ureg.workspace = true
diff --git a/registers/src/csrng.rs → hw/latest/registers/src/csrng.rs b/registers/src/csrng.rs → hw/latest/registers/src/csrng.rs
diff --git a/registers/src/doe.rs → hw/latest/registers/src/doe.rs b/registers/src/doe.rs → hw/latest/registers/src/doe.rs
diff --git a/registers/src/dv.rs → hw/latest/registers/src/dv.rs b/registers/src/dv.rs → hw/latest/registers/src/dv.rs
diff --git a/registers/src/ecc.rs → hw/latest/registers/src/ecc.rs b/registers/src/ecc.rs → hw/latest/registers/src/ecc.rs
diff --git a/registers/src/el2_pic_ctrl.rs → hw/latest/registers/src/el2_pic_ctrl.rs b/registers/src/el2_pic_ctrl.rs → hw/latest/registers/src/el2_pic_ctrl.rs
diff --git a/registers/src/entropy_src.rs → hw/latest/registers/src/entropy_src.rs b/registers/src/entropy_src.rs → hw/latest/registers/src/entropy_src.rs
diff --git a/registers/src/hmac.rs → hw/latest/registers/src/hmac.rs b/registers/src/hmac.rs → hw/latest/registers/src/hmac.rs
diff --git a/registers/src/kv.rs → hw/latest/registers/src/kv.rs b/registers/src/kv.rs → hw/latest/registers/src/kv.rs