rfnoc: Rename and enlarge axi4_mm IO signature

11 files changed, 17 insertions, 18 deletions

diff --git a/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml b/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml
index 481b37e8b..ad4f71260 100644
--- a/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml
+++ b/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml
@@ -44,7 +44,7 @@ data:
 
 io_ports:
   axi_ram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: master
 
 registers:
diff --git a/host/include/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml b/host/include/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml
index 64623cdd0..0e03b0c86 100644
--- a/host/include/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml
+++ b/host/include/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml
@@ -60,7 +60,7 @@ data:
 
 io_ports:
   axi_ram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: master
 
 registers:
diff --git a/host/include/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml b/host/include/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml
index 98bd0128c..ef32a4de6 100644
--- a/host/include/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml
+++ b/host/include/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml
@@ -80,7 +80,7 @@ data:
 
 io_ports:
   axi_ram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: master
 
 registers:
diff --git a/host/include/uhd/rfnoc/blocks/replay.yml b/host/include/uhd/rfnoc/blocks/replay.yml
index 51dc23adb..5501f02b4 100644
--- a/host/include/uhd/rfnoc/blocks/replay.yml
+++ b/host/include/uhd/rfnoc/blocks/replay.yml
@@ -55,7 +55,7 @@ data:
 
 io_ports:
   axi_ram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: master
 
 registers:
diff --git a/host/include/uhd/rfnoc/core/e320_bsp.yml b/host/include/uhd/rfnoc/core/e320_bsp.yml
index 8d0c3f639..cb2b39e9b 100644
--- a/host/include/uhd/rfnoc/core/e320_bsp.yml
+++ b/host/include/uhd/rfnoc/core/e320_bsp.yml
@@ -27,5 +27,5 @@ io_ports:
     type: x300_radio
     drive: master
   dram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: slave
diff --git a/host/include/uhd/rfnoc/core/io_signatures.yml b/host/include/uhd/rfnoc/core/io_signatures.yml
index de8ab0050..7099949df 100644
--- a/host/include/uhd/rfnoc/core/io_signatures.yml
+++ b/host/include/uhd/rfnoc/core/io_signatures.yml
@@ -126,9 +126,8 @@ radio_8x32:
     type: to-master
     width: 8
 
-# A 4-port AXI4 memory-mapped interface with 64-bit data, and 4 GiB address
-# space (32-bit).
-axi4_mm_4x64_4g:
+# AXI4 memory-mapped interface (up to 4 x 512-bit data and 48-bit address)
+axi4_mm:
   type: master-slave
   ports:
   - name: axi_rst
@@ -139,7 +138,7 @@ axi4_mm_4x64_4g:
     width: 4
   - name: m_axi_awaddr
     type: from-master
-    width: 128
+    width: 192
   - name: m_axi_awlen
     type: from-master
     width: 32
@@ -175,10 +174,10 @@ axi4_mm_4x64_4g:
     width: 4
   - name: m_axi_wdata
     type: from-master
-    width: 256
+    width: 2048
   - name: m_axi_wstrb
     type: from-master
-    width: 32
+    width: 256
   - name: m_axi_wlast
     type: from-master
     width: 4
@@ -211,7 +210,7 @@ axi4_mm_4x64_4g:
     width: 4
   - name: m_axi_araddr
     type: from-master
-    width: 128
+    width: 192
   - name: m_axi_arlen
     type: from-master
     width: 32
@@ -250,7 +249,7 @@ axi4_mm_4x64_4g:
     width: 4
   - name: m_axi_rdata
     type: to-master
-    width: 256
+    width: 2048
   - name: m_axi_rresp
     type: to-master
     width: 8
diff --git a/host/include/uhd/rfnoc/core/n300_bsp.yml b/host/include/uhd/rfnoc/core/n300_bsp.yml
index 2fdb5804c..80fb160d5 100644
--- a/host/include/uhd/rfnoc/core/n300_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n300_bsp.yml
@@ -33,5 +33,5 @@ io_ports:
       pattern: (.*)
       repl: \1_radio0
   dram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: slave
diff --git a/host/include/uhd/rfnoc/core/n310_bsp.yml b/host/include/uhd/rfnoc/core/n310_bsp.yml
index ff9978e3d..516834382 100644
--- a/host/include/uhd/rfnoc/core/n310_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n310_bsp.yml
@@ -45,5 +45,5 @@ io_ports:
       pattern: (.*)
       repl: \1_radio1
   dram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: slave
diff --git a/host/include/uhd/rfnoc/core/n320_bsp.yml b/host/include/uhd/rfnoc/core/n320_bsp.yml
index 334ec9007..56ad6131f 100644
--- a/host/include/uhd/rfnoc/core/n320_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n320_bsp.yml
@@ -45,5 +45,5 @@ io_ports:
       pattern: (.*)
       repl: \1_radio1
   dram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: slave
diff --git a/host/include/uhd/rfnoc/core/x300_bsp.yml b/host/include/uhd/rfnoc/core/x300_bsp.yml
index d20f71187..4ea835ac7 100644
--- a/host/include/uhd/rfnoc/core/x300_bsp.yml
+++ b/host/include/uhd/rfnoc/core/x300_bsp.yml
@@ -46,5 +46,5 @@ io_ports:
       pattern: (.*)
       repl: \1_radio1
   dram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: slave
diff --git a/host/include/uhd/rfnoc/core/x310_bsp.yml b/host/include/uhd/rfnoc/core/x310_bsp.yml
index d20f71187..4ea835ac7 100644
--- a/host/include/uhd/rfnoc/core/x310_bsp.yml
+++ b/host/include/uhd/rfnoc/core/x310_bsp.yml
@@ -46,5 +46,5 @@ io_ports:
       pattern: (.*)
       repl: \1_radio1
   dram:
-    type: axi4_mm_4x64_4g
+    type: axi4_mm
     drive: slave