fpga: Update DRAM IO signatures

This updates the IO signatures so that all devices and RFNoC blocks use
the same IO signature for the DRAM. This is needed because the IO
signatures must match between the RFNoC blocks and the devices. This
means that some devices have extra bits in the IO signature for the
address, but the extra bits will simply be ignored.

7 files changed, 6 insertions, 147 deletions

diff --git a/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml b/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml
index 2a2d74e2e..52e03852a 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_2x64_4g
+    type: axi4_mm_4x64_4g
     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 ecf23d7d3..d44f9538d 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_2x64_4g
+    type: axi4_mm_4x64_4g
     drive: master
 
 registers:
diff --git a/host/include/uhd/rfnoc/blocks/replay.yml b/host/include/uhd/rfnoc/blocks/replay.yml
index b871932bc..65177e8fb 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_2x64_4g
+    type: axi4_mm_4x64_4g
     drive: master
 
 registers:
diff --git a/host/include/uhd/rfnoc/core/e320_bsp.yml b/host/include/uhd/rfnoc/core/e320_bsp.yml
index 94ba957d5..8d0c3f639 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_2x64_4g
+    type: axi4_mm_4x64_4g
     drive: slave
diff --git a/host/include/uhd/rfnoc/core/io_signatures.yml b/host/include/uhd/rfnoc/core/io_signatures.yml
index 4151da746..9b1d729f6 100644
--- a/host/include/uhd/rfnoc/core/io_signatures.yml
+++ b/host/include/uhd/rfnoc/core/io_signatures.yml
@@ -78,147 +78,6 @@ x300_radio:
     type: to-master
     width: 2
 
-# A 2-port AXI4 memory-mapped interface with 64-bit data, and 2 GiB address
-# space (32-bit).
-axi4_mm_2x64_4g:
-  type: master-slave
-  ports:
-  - name: axi_rst
-    type: to-master
-    width: 1
-  - name: m_axi_awid
-    type: from-master
-    width: 2
-  - name: m_axi_awaddr
-    type: from-master
-    width: 64
-  - name: m_axi_awlen
-    type: from-master
-    width: 16
-  - name: m_axi_awsize
-    type: from-master
-    width: 6
-  - name: m_axi_awburst
-    type: from-master
-    width: 4
-  - name: m_axi_awlock
-    type: from-master
-    width: 2
-  - name: m_axi_awcache
-    type: from-master
-    width: 8
-  - name: m_axi_awprot
-    type: from-master
-    width: 6
-  - name: m_axi_awqos
-    type: from-master
-    width: 8
-  - name: m_axi_awregion
-    type: from-master
-    width: 8
-  - name: m_axi_awuser
-    type: from-master
-    width: 2
-  - name: m_axi_awvalid
-    type: from-master
-    width: 2
-  - name: m_axi_awready
-    type: to-master
-    width: 2
-  - name: m_axi_wdata
-    type: from-master
-    width: 128
-  - name: m_axi_wstrb
-    type: from-master
-    width: 16
-  - name: m_axi_wlast
-    type: from-master
-    width: 2
-  - name: m_axi_wuser
-    type: from-master
-    width: 2
-  - name: m_axi_wvalid
-    type: from-master
-    width: 2
-  - name: m_axi_wready
-    type: to-master
-    width: 2
-  - name: m_axi_bid
-    type: to-master
-    width: 2
-  - name: m_axi_bresp
-    type: to-master
-    width: 4
-  - name: m_axi_buser
-    type: to-master
-    width: 2
-  - name: m_axi_bvalid
-    type: to-master
-    width: 2
-  - name: m_axi_bready
-    type: from-master
-    width: 2
-  - name: m_axi_arid
-    type: from-master
-    width: 2
-  - name: m_axi_araddr
-    type: from-master
-    width: 64
-  - name: m_axi_arlen
-    type: from-master
-    width: 16
-  - name: m_axi_arsize
-    type: from-master
-    width: 6
-  - name: m_axi_arburst
-    type: from-master
-    width: 4
-  - name: m_axi_arlock
-    type: from-master
-    width: 2
-  - name: m_axi_arcache
-    type: from-master
-    width: 8
-  - name: m_axi_arprot
-    type: from-master
-    width: 6
-  - name: m_axi_arqos
-    type: from-master
-    width: 8
-  - name: m_axi_arregion
-    type: from-master
-    width: 8
-  - name: m_axi_aruser
-    type: from-master
-    width: 2
-  - name: m_axi_arvalid
-    type: from-master
-    width: 2
-  - name: m_axi_arready
-    type: to-master
-    width: 2
-  - name: m_axi_rid
-    type: to-master
-    width: 2
-  - name: m_axi_rdata
-    type: to-master
-    width: 128
-  - name: m_axi_rresp
-    type: to-master
-    width: 4
-  - name: m_axi_rlast
-    type: to-master
-    width: 2
-  - name: m_axi_ruser
-    type: to-master
-    width: 2
-  - name: m_axi_rvalid
-    type: to-master
-    width: 2
-  - name: m_axi_rready
-    type: from-master
-    width: 2
-
 # A 4-port AXI4 memory-mapped interface with 64-bit data, and 4 GiB address
 # space (32-bit).
 axi4_mm_4x64_4g:
diff --git a/host/include/uhd/rfnoc/core/x300_bsp.yml b/host/include/uhd/rfnoc/core/x300_bsp.yml
index cecda0e77..d20f71187 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_2x64_4g
+    type: axi4_mm_4x64_4g
     drive: slave
diff --git a/host/include/uhd/rfnoc/core/x310_bsp.yml b/host/include/uhd/rfnoc/core/x310_bsp.yml
index cecda0e77..d20f71187 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_2x64_4g
+    type: axi4_mm_4x64_4g
     drive: slave