Skip to content

Commit 6b74df7

Browse files
NitsirksNitsirks
authored
Update ABR submodule to include streaming message and dword swizzle fix (#860)
* test and testbench updates for adamsbridge api register dword swizzling * fix for mldsa test after swizzling update in ABR * updating file lists * MICROSOFT AUTOMATED PIPELINE: Stamp 'user/dev/michnorris/abr_update' with updated timestamp and hash after successful run
1 parent 682237f commit 6b74df7

File tree

77 files changed

+2020
-1990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2020
-1990
lines changed

‎.github/workflow_metadata/pr_hash

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b4346b9efd43323f75f75e67316488e755110a4883acada97422d82c0396374133c12908180decb4d2d229b64bb4ee1f
1+
089b036981010418c0722689e3937d8c3444bcbea42ae0671ab106315099f69c2d8000498ac47a8bd86b57670cdfb2ba

‎.github/workflow_metadata/pr_timestamp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1745565133
1+
1745802559

‎src/aes/config/aes.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ ${CALIPTRA_ROOT}/src/csrng/rtl/csrng_reg_pkg.sv
1616
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_pkg.sv
1717
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
1818
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
19-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
2019
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
2120
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
2221
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -26,6 +25,7 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
2625
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
2726
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
2827
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
28+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
2929
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
3030
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
3131
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
@@ -44,7 +44,6 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv
4444
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_pkg.sv
4545
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
4646
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
47-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
4847
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop_en.sv
4948
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop.sv
5049
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_buf.sv
@@ -194,4 +193,6 @@ ${CALIPTRA_ROOT}/src/aes/rtl/aes_reg_top.sv
194193
${CALIPTRA_ROOT}/src/aes/rtl/aes.sv
195194
${CALIPTRA_ROOT}/src/aes/rtl/aes_clp_reg_pkg.sv
196195
${CALIPTRA_ROOT}/src/aes/rtl/aes_clp_reg.sv
197-
${CALIPTRA_ROOT}/src/aes/rtl/aes_clp_wrapper.sv
196+
${CALIPTRA_ROOT}/src/aes/rtl/aes_clp_wrapper.sv
197+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
198+
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv

‎src/aes/config/aes_pkg.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ ${CALIPTRA_ROOT}/src/csrng/rtl/csrng_reg_pkg.sv
1515
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_pkg.sv
1616
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
1717
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
18-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
1918
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
2019
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
2120
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -25,6 +24,7 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
2524
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
2625
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
2726
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
27+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
2828
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
2929
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
3030
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
@@ -43,7 +43,6 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv
4343
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_pkg.sv
4444
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_state_pkg.sv
4545
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv
46-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
4746
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop_en.sv
4847
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop.sv
4948
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_buf.sv
@@ -109,4 +108,6 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_fifo_async_simple.sv
109108
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_gf_mult.sv
110109
${CALIPTRA_ROOT}/src/aes/rtl/aes_reg_pkg.sv
111110
${CALIPTRA_ROOT}/src/aes/rtl/aes_pkg.sv
112-
${CALIPTRA_ROOT}/src/aes/rtl/aes_sbox_canright_pkg.sv
111+
${CALIPTRA_ROOT}/src/aes/rtl/aes_sbox_canright_pkg.sv
112+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
113+
${CALIPTRA_ROOT}/src/lc_ctrl/rtl/lc_ctrl_pkg.sv

‎src/ahb_lite_bus/config/ahb_lite_bus.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
+incdir+${CALIPTRA_ROOT}/src/libs/rtl
33
+incdir+${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl
44
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
5-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
65
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
76
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
87
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -12,9 +11,11 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
1211
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
1312
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
1413
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
15-
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
1614
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
15+
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
1716
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus_inf.sv
1817
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_address_decoder.sv
1918
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_bus.sv
20-
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_2to1_mux.sv
19+
${CALIPTRA_ROOT}/src/ahb_lite_bus/rtl/ahb_lite_2to1_mux.sv
20+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
21+
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v

‎src/axi/config/axi_dma.vf

+11-10
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
+incdir+${CALIPTRA_ROOT}/src/entropy_src/rtl
66
+incdir+${CALIPTRA_ROOT}/src/csrng/rtl
77
+incdir+${CALIPTRA_ROOT}/src/edn/rtl
8+
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl
89
+incdir+${CALIPTRA_ROOT}/src/axi/rtl
910
+incdir+${CALIPTRA_ROOT}/src/soc_ifc/rtl
10-
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl
1111
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
12-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
1312
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
1413
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
1514
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -19,6 +18,7 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
1918
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
2019
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
2120
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
21+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
2222
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
2323
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
2424
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
@@ -44,13 +44,6 @@ ${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_pkg.sv
4444
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_reg_pkg.sv
4545
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_pkg.sv
4646
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
47-
${CALIPTRA_ROOT}/src/axi/rtl/axi_pkg.sv
48-
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv
49-
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
50-
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_pkg.sv
51-
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
52-
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg_pkg.sv
53-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
5447
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop_en.sv
5548
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop.sv
5649
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_buf.sv
@@ -114,11 +107,19 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_clock_mux2.sv
114107
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_fifo_async.sv
115108
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_fifo_async_simple.sv
116109
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_gf_mult.sv
110+
${CALIPTRA_ROOT}/src/axi/rtl/axi_pkg.sv
111+
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv
112+
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_pkg.sv
113+
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_pkg.sv
117114
${CALIPTRA_ROOT}/src/soc_ifc/rtl/mbox_csr_pkg.sv
118115
${CALIPTRA_ROOT}/src/soc_ifc/rtl/sha512_acc_csr_pkg.sv
116+
${CALIPTRA_ROOT}/src/soc_ifc/rtl/soc_ifc_reg_pkg.sv
119117
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_req_if.sv
118+
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg_pkg.sv
120119
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg.sv
121120
${CALIPTRA_ROOT}/src/axi/rtl/axi_mgr_rd.sv
122121
${CALIPTRA_ROOT}/src/axi/rtl/axi_mgr_wr.sv
123122
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_ctrl.sv
124-
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_top.sv
123+
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_top.sv
124+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
125+
${CALIPTRA_ROOT}/src/axi/rtl/axi_dma_reg_pkg.sv

‎src/axi/config/axi_sub.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
+incdir+${CALIPTRA_ROOT}/src/libs/rtl
33
+incdir+${CALIPTRA_ROOT}/src/axi/rtl
44
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
5-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
65
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
76
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
87
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -12,12 +11,14 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
1211
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
1312
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
1413
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
14+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
1515
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
1616
${CALIPTRA_ROOT}/src/axi/rtl/axi_pkg.sv
1717
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv
18-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
1918
${CALIPTRA_ROOT}/src/axi/rtl/axi_addr.v
2019
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_rd.sv
2120
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_wr.sv
2221
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_arb.sv
23-
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub.sv
22+
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub.sv
23+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
24+
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv

‎src/axi/config/caliptra_axi_sram.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
+incdir+${CALIPTRA_ROOT}/src/libs/rtl
33
+incdir+${CALIPTRA_ROOT}/src/axi/rtl
44
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
5-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
65
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
76
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
87
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -12,13 +11,15 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
1211
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
1312
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
1413
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
14+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
1515
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
1616
${CALIPTRA_ROOT}/src/axi/rtl/axi_pkg.sv
1717
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv
18-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
1918
${CALIPTRA_ROOT}/src/axi/rtl/axi_addr.v
2019
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_rd.sv
2120
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_wr.sv
2221
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_arb.sv
2322
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub.sv
24-
${CALIPTRA_ROOT}/src/axi/rtl/caliptra_axi_sram.sv
23+
${CALIPTRA_ROOT}/src/axi/rtl/caliptra_axi_sram.sv
24+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
25+
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv

‎src/caliptra_prim/config/caliptra_prim.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
+incdir+${CALIPTRA_ROOT}/src/edn/rtl
88
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl
99
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
10-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
1110
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
1211
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
1312
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -17,6 +16,7 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
1716
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
1817
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
1918
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
19+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
2020
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
2121
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
2222
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
@@ -42,7 +42,6 @@ ${CALIPTRA_ROOT}/src/entropy_src/rtl/entropy_src_pkg.sv
4242
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_reg_pkg.sv
4343
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_pkg.sv
4444
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
45-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
4645
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop_en.sv
4746
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_flop.sv
4847
${CALIPTRA_ROOT}/src/caliptra_prim_generic/rtl/caliptra_prim_generic_buf.sv
@@ -105,4 +104,6 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_mubi4_dec.sv
105104
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_clock_mux2.sv
106105
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_fifo_async.sv
107106
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_fifo_async_simple.sv
108-
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_gf_mult.sv
107+
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_gf_mult.sv
108+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
109+
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv

‎src/caliptra_prim/config/caliptra_prim_pkg.vf

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
+incdir+${CALIPTRA_ROOT}/src/libs/rtl
33
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
44
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
5-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
65
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
76
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
87
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -12,6 +11,7 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
1211
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
1312
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
1413
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
14+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
1515
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
1616
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
1717
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
@@ -27,5 +27,5 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_ram_1p_pkg.sv
2727
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_esc_pkg.sv
2828
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_count_pkg.sv
2929
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv
30-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
30+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
3131
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv

‎src/caliptra_prim/config/caliptra_prim_secded.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
+incdir+${CALIPTRA_ROOT}/src/libs/rtl
33
+incdir+${CALIPTRA_ROOT}/src/caliptra_prim/rtl
44
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
5-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
65
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
76
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
87
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -12,6 +11,7 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
1211
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
1312
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
1413
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
14+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
1515
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
1616
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
1717
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
@@ -27,7 +27,6 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_ram_1p_pkg.sv
2727
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_esc_pkg.sv
2828
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_count_pkg.sv
2929
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv
30-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
3130
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_22_16_dec.sv
3231
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_22_16_enc.sv
3332
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_28_22_dec.sv
@@ -63,4 +62,6 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_hamming_39_32_en
6362
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_hamming_72_64_dec.sv
6463
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_hamming_72_64_enc.sv
6564
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_hamming_76_68_dec.sv
66-
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_hamming_76_68_enc.sv
65+
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_inv_hamming_76_68_enc.sv
66+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
67+
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv

‎src/caliptra_tlul/config/caliptra_tlul_pkg.vf

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ ${CALIPTRA_ROOT}/src/csrng/rtl/csrng_reg_pkg.sv
1313
${CALIPTRA_ROOT}/src/csrng/rtl/csrng_pkg.sv
1414
${CALIPTRA_ROOT}/src/edn/rtl/edn_pkg.sv
1515
${CALIPTRA_ROOT}/src/integration/rtl/config_defines.svh
16-
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
1716
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sva.svh
1817
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_macros.svh
1918
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_sram.sv
@@ -23,6 +22,7 @@ ${CALIPTRA_ROOT}/src/libs/rtl/ahb_slv_sif.sv
2322
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_icg.sv
2423
${CALIPTRA_ROOT}/src/libs/rtl/clk_gate.sv
2524
${CALIPTRA_ROOT}/src/libs/rtl/caliptra_2ff_sync.sv
25+
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
2626
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
2727
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_util_pkg.sv
2828
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_alert_pkg.sv
@@ -38,7 +38,6 @@ ${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_ram_1p_pkg.sv
3838
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_esc_pkg.sv
3939
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_count_pkg.sv
4040
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv
41-
${CALIPTRA_ROOT}/src/libs/rtl/ahb_to_reg_adapter.sv
4241
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_22_16_dec.sv
4342
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_22_16_enc.sv
4443
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/caliptra_prim_secded_28_22_dec.sv
@@ -84,4 +83,6 @@ ${CALIPTRA_ROOT}/src/caliptra_tlul/rtl/caliptra_tlul_rsp_intg_gen.sv
8483
${CALIPTRA_ROOT}/src/caliptra_tlul/rtl/caliptra_tlul_rsp_intg_chk.sv
8584
${CALIPTRA_ROOT}/src/caliptra_tlul/rtl/caliptra_tlul_data_integ_dec.sv
8685
${CALIPTRA_ROOT}/src/caliptra_tlul/rtl/caliptra_tlul_data_integ_enc.sv
87-
${CALIPTRA_ROOT}/src/caliptra_tlul/rtl/caliptra_tlul_err.sv
86+
${CALIPTRA_ROOT}/src/caliptra_tlul/rtl/caliptra_tlul_err.sv
87+
${CALIPTRA_ROOT}/src/integration/rtl/caliptra_reg_defines.svh
88+
${CALIPTRA_ROOT}/src/caliptra_prim/rtl/keymgr_pkg.sv

0 commit comments

Comments
 (0)