Skip to content

Commit 6bb88ae

Browse files
committed
[axi_sub] Remove the duplicated axi_sub library
The lib was previously duplicated from the original caliptra version only to introduce a duplicate parameter (AG with the same function as BW). Additionally, axi_sub would not support different data widths for the axi and component side. Signed-off-by: Florian Glaser <glaserf@lowrisc.org>
1 parent 33ba157 commit 6bb88ae

10 files changed

Lines changed: 21 additions & 1243 deletions

File tree

src/hci/axi_adapter.sv

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,8 @@ module axi_adapter #(
193193
logic i3c_rd_err, i3c_wr_err;
194194

195195
// Instantiate AXI subordinate to component interface module
196-
i3c_axi_sub #(
196+
axi_sub #(
197197
.AW(CsrAddrWidth),
198-
.AG($clog2(CsrDataWidth/8)),
199198
.DW(AxiDataWidth),
200199
.UW(AxiUserWidth),
201200
.IW(AxiIdWidth)

src/i3c.f

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
${CALIPTRA_ROOT}/src/axi/rtl/axi_pkg.sv
1616
${CALIPTRA_ROOT}/src/axi/rtl/axi_if.sv
1717
${CALIPTRA_ROOT}/src/axi/rtl/axi_addr.v
18+
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_arb.sv
19+
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_rd.sv
20+
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub_wr.sv
21+
${CALIPTRA_ROOT}/src/axi/rtl/axi_sub.sv
1822
${CALIPTRA_ROOT}/src/libs/rtl/skidbuffer.v
1923
${I3C_ROOT_DIR}/src/libs/mem/prim_ram_1p_pkg.sv
2024
${I3C_ROOT_DIR}/src/libs/mem/prim_generic_ram_1p.sv
@@ -28,10 +32,6 @@
2832
${I3C_ROOT_DIR}/src/phy/i3c_phy.sv
2933
${I3C_ROOT_DIR}/src/csr/I3CCSR.sv
3034
${I3C_ROOT_DIR}/src/interrupt.sv
31-
${I3C_ROOT_DIR}/src/libs/axi_sub/i3c_axi_sub_arb.sv
32-
${I3C_ROOT_DIR}/src/libs/axi_sub/i3c_axi_sub_rd.sv
33-
${I3C_ROOT_DIR}/src/libs/axi_sub/i3c_axi_sub.sv
34-
${I3C_ROOT_DIR}/src/libs/axi_sub/i3c_axi_sub_wr.sv
3535
${I3C_ROOT_DIR}/src/hci/queues/read_queue.sv
3636
${I3C_ROOT_DIR}/src/hci/queues/write_queue.sv
3737
${I3C_ROOT_DIR}/src/hci/ahb_if.sv

src/libs/axi_sub/i3c_axi_sub.sv

Lines changed: 0 additions & 225 deletions
This file was deleted.

0 commit comments

Comments
 (0)