Skip to content

Commit

Permalink
Point hw/1.0/rtl at caliptra-rtl patch_v1.0 branch (chipsalliance#1412)
Browse files Browse the repository at this point in the history
This replaces the original main_1.0 branch that has since been deleted,
and is now causing the nightly release to break.
  • Loading branch information
korran authored Mar 15, 2024
1 parent 84226dd commit b3f3662
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[submodule "hw/1.0/rtl"]
path = hw/1.0/rtl
url = https://github.com/chipsalliance/caliptra-rtl
branch = main_1.0
branch = patch_v1.0
[submodule "dpe"]
path = dpe
url = https://github.com/chipsalliance/caliptra-dpe.git
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/csrng.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/doe.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/dv.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/ecc.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/el2_pic_ctrl.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/entropy_src.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/hmac.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/kv.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![no_std]
#![allow(clippy::erasing_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/mbox.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/pv.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/sha256.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/sha512.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/sha512_acc.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/soc_ifc.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/soc_ifc_trng.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/spi_host.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/registers/src/uart.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Licensed under the Apache-2.0 license.
//
// generated by caliptra_registers_generator with caliptra-rtl repo at 281c45ffee0a7008437c35e06f64d03df120c8fb
// generated by caliptra_registers_generator with caliptra-rtl repo at 7c953512251707d6f77d7d9a2f6be186ed013d50
//
#![allow(clippy::erasing_op)]
#![allow(clippy::identity_op)]
Expand Down
2 changes: 1 addition & 1 deletion hw/1.0/rtl
Submodule rtl updated 64 files
+0 −14 .github/scripts/build_tests_matrix.py
+0 −13 .github/scripts/gdb_test.sh
+0 −13 .github/scripts/openocd_test.sh
+0 −14 .github/scripts/utils.sh
+2 −7 README.md
+61 −61 docs/CaliptraIntegrationSpecification.md
+1 −1 src/ahb_lite_bus/config/compile.yml
+1 −0 src/caliptra_prim/config/caliptra_prim_pkg.vf
+1 −1 src/datavault/config/compile.yml
+0 −3 src/datavault/rtl/dv_reg.sv
+1 −1 src/doe/config/compile.yml
+0 −3 src/doe/rtl/doe_reg.sv
+1 −1 src/ecc/config/compile.yml
+0 −3 src/ecc/rtl/ecc_reg.sv
+1 −1 src/hmac/config/compile.yml
+0 −3 src/hmac/rtl/hmac_reg.sv
+15 −42 src/integration/asserts/caliptra_top_sva.sv
+2 −2 src/integration/config/compile.yml
+3 −1 src/integration/rtl/caliptra_top.sv
+3 −3 src/integration/stimulus/L0_regression.yml
+2 −2 src/integration/stimulus/testsuites/uvmf_caliptra_top_nightly_directed_regression.yml
+2 −0 src/integration/tb/caliptra_top_tb.sv
+8 −8 src/integration/tb/caliptra_top_tb_services.sv
+5 −32 src/integration/test_suites/caliptra_top/caliptra_top.c
+0 −17 src/integration/test_suites/smoke_test_clk_gating/smoke_test_clk_gating.yml
+0 −242 src/integration/test_suites/smoke_test_clk_gating/smoke_test_clk_gating_asm.s
+2 −25 src/integration/test_suites/smoke_test_doe_cg/smoke_test_doe_cg.c
+0 −5 src/integration/test_suites/smoke_test_kv_cg/smoke_test_kv_cg.c
+2 −2 src/integration/uvmf_caliptra_top/config/compile.yml
+0 −23 ...iptra_top/uvmf_template_output/project_benches/caliptra_top/tb/sequences/src/caliptra_top_rand_sequence.svh
+2 −0 src/integration/uvmf_caliptra_top/uvmf_template_output/project_benches/caliptra_top/tb/testbench/hdl_top.sv
+1 −1 src/keyvault/config/compile.yml
+0 −3 src/keyvault/rtl/kv_reg.sv
+19 −50 src/keyvault/uvmf_kv/uvmf_template_output/verification_ip/environment_packages/kv_env_pkg/src/kv_predictor.svh
+22 −28 ...vmf_kv/uvmf_template_output/verification_ip/environment_packages/kv_env_pkg/src/kv_wr_rd_debug_sequence.svh
+0 −1 .../uvmf_kv/uvmf_template_output/verification_ip/interface_packages/kv_rst_pkg/src/kv_rst_scan_on_sequence.svh
+1 −1 src/libs/uvmf/qvip_ahb_lite_slave_dir/config_policies/ahb_lite_slave_0_config_policy.svh
+1 −1 src/pcrvault/config/compile.yml
+0 −3 src/pcrvault/rtl/pv_reg.sv
+1 −1 src/riscv_core/veer_el2/config/compile.yml
+3 −3 src/riscv_core/veer_el2/rtl/el2_veer_wrapper.sv
+1 −1 src/sha256/config/compile.yml
+0 −3 src/sha256/rtl/sha256_reg.sv
+1 −1 src/sha512/config/compile.yml
+0 −15 src/sha512/formal/model/tb/sc_main.cpp
+0 −15 src/sha512/formal/model/tb/tb.cpp
+0 −15 src/sha512/formal/model/tb/tb.h
+0 −3 src/sha512/rtl/sha512_reg.sv
+1 −1 src/soc_ifc/config/compile.yml
+0 −3 src/soc_ifc/rtl/mbox_csr.sv
+0 −3 src/soc_ifc/rtl/sha512_acc_csr.sv
+0 −3 src/soc_ifc/rtl/soc_ifc_reg.sv
+1 −6 ...ion_ip/environment_packages/soc_ifc_env_pkg/sequences/bringup/cptra/soc_ifc_env_cptra_rst_wait_sequence.svh
+0 −3 ...on_ip/environment_packages/soc_ifc_env_pkg/sequences/mbox/cptra/soc_ifc_env_cptra_mbox_handler_sequence.svh
+1 −1 ...ment_packages/soc_ifc_env_pkg/sequences/mbox/soc_ifc/soc_ifc_env_mbox_rand_medium_interference_sequence.svh
+0 −1 ...on_ip/environment_packages/soc_ifc_env_pkg/sequences/mbox/soc_ifc/soc_ifc_env_mbox_rand_pauser_sequence.svh
+0 −1 ...p/environment_packages/soc_ifc_env_pkg/sequences/mbox/soc_ifc/soc_ifc_env_mbox_reg_axs_invalid_sequence.svh
+3 −22 ...ification_ip/environment_packages/soc_ifc_env_pkg/sequences/mbox/soc_ifc/soc_ifc_env_mbox_sequence_base.svh
+0 −1 ...ironment_packages/soc_ifc_env_pkg/sequences/mbox/soc_ifc/soc_ifc_env_mbox_sram_double_bit_flip_sequence.svh
+0 −1 ...ip/environment_packages/soc_ifc_env_pkg/sequences/mbox/soc_ifc_env_top_mbox_rand_medium_unlock_sequence.svh
+1 −2 ...soc_ifc/uvmf_template_output/verification_ip/environment_packages/soc_ifc_env_pkg/src/soc_ifc_predictor.svh
+1 −4 ...f_template_output/verification_ip/interface_packages/cptra_ctrl_pkg/src/cptra_ctrl_transaction_coverage.svh
+0 −15 tools/scripts/rdl_post_process.py
+1 −1 tools/scripts/run_verilator_l0_regression.py

0 comments on commit b3f3662

Please sign in to comment.