Skip to content

Commit

Permalink
Upgrade RV core to latest, enable SMEPMP and User Mode (#628)
Browse files Browse the repository at this point in the history
* Override reset_vec to 0x0 with script call option (no longer need to hand-edit script)

* Refactor iccm config for maintainability

* VeeR core update to latest design file version

* Add rev info file to indicate VeeR version consumed

* Remove JTAG IDCODE command, as previously done

* Route a core_enable signal to conditionally disable internal core TAP access

* Add a dmi_active output signal

* Updated RV instance for compatibility with latest DMI export signals

* Updated VeeR mem export interface splits data/ecc

* Enable SMEPMP with 64-entries; enable user-mode

* Update directory includes/dependencies

* Requires soc_ifc_pkg

* Port width fix

* First index is for bank number - fix

* Move localparams to top of file, so they exist at the first usage

* Update license headers on RV core

* Regenerate file lists

* Revert latch fix that causes Verilator failures

* Replace 'repeat' (verilator dislikes) with for-loop; add missing begin-end

* MICROSOFT AUTOMATED PIPELINE: Stamp 'cwhitehead-msft-rv-upgrade' with updated timestamp and hash after successful run
  • Loading branch information
calebofearth authored Nov 12, 2024
1 parent 0dcc957 commit 098519c
Show file tree
Hide file tree
Showing 62 changed files with 4,459 additions and 1,757 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/license_header_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ exclude_dir='{uvmf*,.git,cmark,caliptra_reg_html,caliptra_top_reg_html,sha256,sh
exclude_suffix='*.{tcl,txt,js,htm,html,json,vf,yml,woff,rsp,rdl,bashrc,waiver,cfg,hex,rc,exe,pdf,png,hvp,svg,log}'
exclude_regs='*_reg*.{sv,rdl}'
exclude_csr='*_csr*.*'
exclude_file='{sglint_waivers,pr_hash,pr_timestamp,.git,.git-comodules,.gitignore,.gitmodules,spyglass_lint.policy,ascent.ctl,clp_mapfile,readme.md,README.md,SECURITY.md,c_sample.c,test_dilithium5}'
exclude_file='{sglint_waivers,pr_hash,pr_timestamp,.git,.git-comodules,.gitignore,.gitmodules,spyglass_lint.policy,ascent.ctl,clp_mapfile,readme.md,README.md,SECURITY.md,c_sample.c,test_dilithium5,riscv_rev_info}'
apache_patn='Licensed under the Apache License\|Apache License, Version 2\.0 (the \"License\")'

# Recursive find through repository with some major exclusions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflow_metadata/pr_hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
374c7baec55c97611a6c6065eb7ea4fb78561213bb5bdff113bf7d35ff86b3aa85d352dcf6d2e4327ccbddbadba392ae
74eb435936566a8abc256940418d44e776b9e86cc0297e96fdd1513f1e36e70fee5d57590ff14eaaabf74c6727d10309
2 changes: 1 addition & 1 deletion .github/workflow_metadata/pr_timestamp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1731352011
1731369802
5 changes: 5 additions & 0 deletions src/axi/config/axi_dma.vf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
+incdir+${CALIPTRA_ROOT}/src/lc_ctrl/rtl
+incdir+${CALIPTRA_ROOT}/src/axi/rtl
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
Expand All @@ -29,6 +30,8 @@ ${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop_en.sv
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop.sv
Expand Down Expand Up @@ -64,6 +67,8 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_arbiter_ppc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sum_tree.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_ext.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_edge_detector.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_req_if.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg.sv
Expand Down
1 change: 1 addition & 0 deletions src/axi/config/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ requires:
- libs
- caliptra_prim
- axi_pkg
- soc_ifc_pkg
targets:
rtl:
directories: [$COMPILE_ROOT/rtl]
Expand Down
24 changes: 14 additions & 10 deletions src/integration/config/caliptra_top.vf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
+incdir+${CALIPTRA_ROOT}/src/keyvault/rtl
+incdir+${CALIPTRA_ROOT}/src/pcrvault/rtl
+incdir+${CALIPTRA_ROOT}/src/datavault/rtl
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
+incdir+${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl
+incdir+${CALIPTRA_ROOT}/src/doe/rtl
+incdir+${CALIPTRA_ROOT}/submodules/adams-bridge/src/mldsa_top/rtl
Expand All @@ -16,9 +15,11 @@
+incdir+${CALIPTRA_ROOT}/src/axi/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
+incdir+${CALIPTRA_ROOT}/src/lc_ctrl/rtl
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
+incdir+${CALIPTRA_ROOT}/src/entropy_src/rtl
+incdir+${CALIPTRA_ROOT}/src/entropy_src/tb
+incdir+${CALIPTRA_ROOT}/src/csrng/rtl
+incdir+${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/include
+incdir+${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl
+incdir+${CALIPTRA_ROOT}/src/sha512/rtl
+incdir+${CALIPTRA_ROOT}/src/sha256/rtl
Expand Down Expand Up @@ -63,8 +64,6 @@ ${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_defines_pkg.sv
${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_macros.svh
${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_gen_hash.sv
${CALIPTRA_ROOT}/src/datavault/rtl/dv_defines_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pdef.vh
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/include/el2_def.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/common_defines.sv
Expand Down Expand Up @@ -119,6 +118,8 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sparse_fsm_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_main_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_ack_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_reg_pkg.sv
Expand All @@ -127,21 +128,16 @@ ${CALIPTRA_ROOT}/src/entropy_src/tb/physical_rng.sv
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_reg_pkg.sv
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_pkg.sv
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lib/beh_lib.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_mem.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_dma_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pic_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer_wrapper.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dbg/el2_dbg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_decode_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_gpr_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_ib_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_tlu_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_trigger.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_pmp_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_mux.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_jtag_to_core_sync.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_wrapper.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/rvjtag_tap.v
Expand Down Expand Up @@ -173,6 +169,12 @@ ${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_lsc_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_stbuf.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_trigger.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_mem.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_dma_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pic_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pmp.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer_wrapper.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus_inf.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_address_decoder.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus.sv
Expand Down Expand Up @@ -390,6 +392,8 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_arbiter_ppc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sum_tree.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_ext.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_edge_detector.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_req_if.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg.sv
Expand Down
24 changes: 14 additions & 10 deletions src/integration/config/caliptra_top_tb.vf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
+incdir+${CALIPTRA_ROOT}/src/axi/rtl
+incdir+${CALIPTRA_ROOT}/src/pcrvault/rtl
+incdir+${CALIPTRA_ROOT}/src/datavault/rtl
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
+incdir+${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl
+incdir+${CALIPTRA_ROOT}/submodules/adams-bridge/src/mldsa_top/rtl
+incdir+${CALIPTRA_ROOT}/submodules/adams-bridge/src/abr_libs/rtl
Expand All @@ -17,6 +16,7 @@
+incdir+${CALIPTRA_ROOT}/submodules/adams-bridge/src/norm_check/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
+incdir+${CALIPTRA_ROOT}/src/lc_ctrl/rtl
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
+incdir+${CALIPTRA_ROOT}/src/entropy_src/rtl
+incdir+${CALIPTRA_ROOT}/src/entropy_src/tb
+incdir+${CALIPTRA_ROOT}/src/csrng/rtl
Expand All @@ -29,6 +29,7 @@
+incdir+${CALIPTRA_ROOT}/src/keyvault/coverage
+incdir+${CALIPTRA_ROOT}/src/integration/tb
+incdir+${CALIPTRA_ROOT}/src/integration/coverage
+incdir+${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/include
+incdir+${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl
+incdir+${CALIPTRA_ROOT}/src/sha512/rtl
+incdir+${CALIPTRA_ROOT}/src/sha256/rtl
Expand Down Expand Up @@ -77,8 +78,6 @@ ${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_defines_pkg.sv
${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_macros.svh
${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_gen_hash.sv
${CALIPTRA_ROOT}/src/datavault/rtl/dv_defines_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pdef.vh
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/include/el2_def.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/common_defines.sv
Expand Down Expand Up @@ -130,6 +129,8 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sparse_fsm_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_main_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_ack_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_reg_pkg.sv
Expand Down Expand Up @@ -169,21 +170,16 @@ ${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_wr.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_arb.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub.sv
${CALIPTRA_ROOT}/src/axi/rtl/caliptra_axi_sram.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lib/beh_lib.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_mem.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_dma_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pic_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer_wrapper.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dbg/el2_dbg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_decode_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_gpr_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_ib_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_tlu_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_trigger.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_pmp_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_mux.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_jtag_to_core_sync.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_wrapper.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/rvjtag_tap.v
Expand Down Expand Up @@ -215,6 +211,12 @@ ${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_lsc_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_stbuf.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_trigger.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_mem.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_dma_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pic_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pmp.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer_wrapper.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus_inf.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_address_decoder.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus.sv
Expand Down Expand Up @@ -427,6 +429,8 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_arbiter_ppc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sum_tree.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_ext.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_edge_detector.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_req_if.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg.sv
Expand Down
24 changes: 14 additions & 10 deletions src/integration/config/caliptra_top_tb_pkg.vf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
+incdir+${CALIPTRA_ROOT}/src/axi/rtl
+incdir+${CALIPTRA_ROOT}/src/pcrvault/rtl
+incdir+${CALIPTRA_ROOT}/src/datavault/rtl
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
+incdir+${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl
+incdir+${CALIPTRA_ROOT}/submodules/adams-bridge/src/mldsa_top/rtl
+incdir+${CALIPTRA_ROOT}/submodules/adams-bridge/src/abr_libs/rtl
Expand All @@ -17,6 +16,7 @@
+incdir+${CALIPTRA_ROOT}/submodules/adams-bridge/src/norm_check/rtl
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
+incdir+${CALIPTRA_ROOT}/src/lc_ctrl/rtl
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
+incdir+${CALIPTRA_ROOT}/src/entropy_src/rtl
+incdir+${CALIPTRA_ROOT}/src/entropy_src/tb
+incdir+${CALIPTRA_ROOT}/src/csrng/rtl
Expand All @@ -29,6 +29,7 @@
+incdir+${CALIPTRA_ROOT}/src/keyvault/coverage
+incdir+${CALIPTRA_ROOT}/src/integration/tb
+incdir+${CALIPTRA_ROOT}/src/integration/coverage
+incdir+${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/include
+incdir+${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl
+incdir+${CALIPTRA_ROOT}/src/sha512/rtl
+incdir+${CALIPTRA_ROOT}/src/sha256/rtl
Expand Down Expand Up @@ -77,8 +78,6 @@ ${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_defines_pkg.sv
${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_macros.svh
${CALIPTRA_ROOT}/src/pcrvault/rtl/pv_gen_hash.sv
${CALIPTRA_ROOT}/src/datavault/rtl/dv_defines_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pdef.vh
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/include/el2_def.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/common_defines.sv
Expand Down Expand Up @@ -130,6 +129,8 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sparse_fsm_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_main_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_ack_sm_pkg.sv
${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_reg_pkg.sv
Expand Down Expand Up @@ -168,21 +169,16 @@ ${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_wr.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_arb.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub.sv
${CALIPTRA_ROOT}/src/axi/rtl/caliptra_axi_sram.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lib/beh_lib.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_mem.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_dma_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pic_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer_wrapper.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dbg/el2_dbg.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_decode_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_gpr_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_ib_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_tlu_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_trigger.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dec/el2_dec_pmp_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_mux.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_jtag_to_core_sync.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/dmi_wrapper.v
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/dmi/rvjtag_tap.v
Expand Down Expand Up @@ -214,6 +210,12 @@ ${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_lsc_ctl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_stbuf.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/lsu/el2_lsu_trigger.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_mem.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_dma_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pic_ctrl.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_pmp.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer.sv
${CALIPTRA_ROOT}/src/riscv_core/veer_el2/rtl/el2_veer_wrapper.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus_inf.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_address_decoder.sv
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus.sv
Expand Down Expand Up @@ -426,6 +428,8 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_arbiter_ppc.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_sum_tree.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_subreg_ext.sv
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_edge_detector.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_req_if.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg_pkg.sv
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg.sv
Expand Down
Loading

0 comments on commit 098519c

Please sign in to comment.