aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Fife <wade.fife@ettus.com>2019-11-20 12:38:34 -0600
committerMartin Braun <martin.braun@ettus.com>2019-11-26 12:21:34 -0800
commit3132634bb427044e123b072658690ce47c56fd48 (patch)
tree950b23b395306b0eb2fb01e29c8c5babb9242e8d
parent91f8a9b8b245d5653493c1d65e7523e98717a892 (diff)
downloaduhd-3132634bb427044e123b072658690ce47c56fd48.tar.gz
uhd-3132634bb427044e123b072658690ce47c56fd48.tar.bz2
uhd-3132634bb427044e123b072658690ce47c56fd48.zip
rfnoc: Fix RAM port direction in YAML
-rw-r--r--host/include/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml2
-rw-r--r--host/include/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml2
-rw-r--r--host/include/uhd/rfnoc/core/e320_bsp.yml2
-rw-r--r--host/include/uhd/rfnoc/core/io_signatures.yml180
-rw-r--r--host/include/uhd/rfnoc/core/n300_bsp.yml2
-rw-r--r--host/include/uhd/rfnoc/core/n310_bsp.yml2
-rw-r--r--host/include/uhd/rfnoc/core/n320_bsp.yml2
-rw-r--r--host/include/uhd/rfnoc/core/x300_bsp.yml2
-rw-r--r--host/include/uhd/rfnoc/core/x310_bsp.yml2
9 files changed, 98 insertions, 98 deletions
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 1e5bc8452..ecf23d7d3 100644
--- a/host/include/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml
+++ b/host/include/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml
@@ -61,7 +61,7 @@ data:
io_ports:
axi_ram:
type: axi4_mm_2x64_4g
- drive: slave
+ 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 9ef16c7c5..961b2ed2d 100644
--- a/host/include/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml
+++ b/host/include/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml
@@ -81,7 +81,7 @@ data:
io_ports:
axi_ram:
type: axi4_mm_4x64_4g
- drive: slave
+ drive: master
registers:
diff --git a/host/include/uhd/rfnoc/core/e320_bsp.yml b/host/include/uhd/rfnoc/core/e320_bsp.yml
index cb4d28637..94ba957d5 100644
--- a/host/include/uhd/rfnoc/core/e320_bsp.yml
+++ b/host/include/uhd/rfnoc/core/e320_bsp.yml
@@ -28,4 +28,4 @@ io_ports:
drive: master
dram:
type: axi4_mm_2x64_4g
- drive: master
+ drive: slave
diff --git a/host/include/uhd/rfnoc/core/io_signatures.yml b/host/include/uhd/rfnoc/core/io_signatures.yml
index a4b510876..4151da746 100644
--- a/host/include/uhd/rfnoc/core/io_signatures.yml
+++ b/host/include/uhd/rfnoc/core/io_signatures.yml
@@ -84,139 +84,139 @@ axi4_mm_2x64_4g:
type: master-slave
ports:
- name: axi_rst
- type: from-master
+ type: to-master
width: 1
- name: m_axi_awid
- type: to-master
+ type: from-master
width: 2
- name: m_axi_awaddr
- type: to-master
+ type: from-master
width: 64
- name: m_axi_awlen
- type: to-master
+ type: from-master
width: 16
- name: m_axi_awsize
- type: to-master
+ type: from-master
width: 6
- name: m_axi_awburst
- type: to-master
+ type: from-master
width: 4
- name: m_axi_awlock
- type: to-master
+ type: from-master
width: 2
- name: m_axi_awcache
- type: to-master
+ type: from-master
width: 8
- name: m_axi_awprot
- type: to-master
+ type: from-master
width: 6
- name: m_axi_awqos
- type: to-master
+ type: from-master
width: 8
- name: m_axi_awregion
- type: to-master
+ type: from-master
width: 8
- name: m_axi_awuser
- type: to-master
+ type: from-master
width: 2
- name: m_axi_awvalid
- type: to-master
+ type: from-master
width: 2
- name: m_axi_awready
- type: from-master
+ type: to-master
width: 2
- name: m_axi_wdata
- type: to-master
+ type: from-master
width: 128
- name: m_axi_wstrb
- type: to-master
+ type: from-master
width: 16
- name: m_axi_wlast
- type: to-master
+ type: from-master
width: 2
- name: m_axi_wuser
- type: to-master
+ type: from-master
width: 2
- name: m_axi_wvalid
- type: to-master
+ type: from-master
width: 2
- name: m_axi_wready
- type: from-master
+ type: to-master
width: 2
- name: m_axi_bid
- type: from-master
+ type: to-master
width: 2
- name: m_axi_bresp
- type: from-master
+ type: to-master
width: 4
- name: m_axi_buser
- type: from-master
+ type: to-master
width: 2
- name: m_axi_bvalid
- type: from-master
+ type: to-master
width: 2
- name: m_axi_bready
- type: to-master
+ type: from-master
width: 2
- name: m_axi_arid
- type: to-master
+ type: from-master
width: 2
- name: m_axi_araddr
- type: to-master
+ type: from-master
width: 64
- name: m_axi_arlen
- type: to-master
+ type: from-master
width: 16
- name: m_axi_arsize
- type: to-master
+ type: from-master
width: 6
- name: m_axi_arburst
- type: to-master
+ type: from-master
width: 4
- name: m_axi_arlock
- type: to-master
+ type: from-master
width: 2
- name: m_axi_arcache
- type: to-master
+ type: from-master
width: 8
- name: m_axi_arprot
- type: to-master
+ type: from-master
width: 6
- name: m_axi_arqos
- type: to-master
+ type: from-master
width: 8
- name: m_axi_arregion
- type: to-master
+ type: from-master
width: 8
- name: m_axi_aruser
- type: to-master
+ type: from-master
width: 2
- name: m_axi_arvalid
- type: to-master
+ type: from-master
width: 2
- name: m_axi_arready
- type: from-master
+ type: to-master
width: 2
- name: m_axi_rid
- type: from-master
+ type: to-master
width: 2
- name: m_axi_rdata
- type: from-master
+ type: to-master
width: 128
- name: m_axi_rresp
- type: from-master
+ type: to-master
width: 4
- name: m_axi_rlast
- type: from-master
+ type: to-master
width: 2
- name: m_axi_ruser
- type: from-master
+ type: to-master
width: 2
- name: m_axi_rvalid
- type: from-master
+ type: to-master
width: 2
- name: m_axi_rready
- type: to-master
+ type: from-master
width: 2
# A 4-port AXI4 memory-mapped interface with 64-bit data, and 4 GiB address
@@ -225,137 +225,137 @@ axi4_mm_4x64_4g:
type: master-slave
ports:
- name: axi_rst
- type: from-master
+ type: to-master
width: 1
- name: m_axi_awid
- type: to-master
+ type: from-master
width: 4
- name: m_axi_awaddr
- type: to-master
+ type: from-master
width: 128
- name: m_axi_awlen
- type: to-master
+ type: from-master
width: 32
- name: m_axi_awsize
- type: to-master
+ type: from-master
width: 12
- name: m_axi_awburst
- type: to-master
+ type: from-master
width: 8
- name: m_axi_awlock
- type: to-master
+ type: from-master
width: 4
- name: m_axi_awcache
- type: to-master
+ type: from-master
width: 16
- name: m_axi_awprot
- type: to-master
+ type: from-master
width: 12
- name: m_axi_awqos
- type: to-master
+ type: from-master
width: 16
- name: m_axi_awregion
- type: to-master
+ type: from-master
width: 16
- name: m_axi_awuser
- type: to-master
+ type: from-master
width: 4
- name: m_axi_awvalid
- type: to-master
+ type: from-master
width: 4
- name: m_axi_awready
- type: from-master
+ type: to-master
width: 4
- name: m_axi_wdata
- type: to-master
+ type: from-master
width: 256
- name: m_axi_wstrb
- type: to-master
+ type: from-master
width: 32
- name: m_axi_wlast
- type: to-master
+ type: from-master
width: 4
- name: m_axi_wuser
- type: to-master
+ type: from-master
width: 4
- name: m_axi_wvalid
- type: to-master
+ type: from-master
width: 4
- name: m_axi_wready
- type: from-master
+ type: to-master
width: 4
- name: m_axi_bid
- type: from-master
+ type: to-master
width: 4
- name: m_axi_bresp
- type: from-master
+ type: to-master
width: 8
- name: m_axi_buser
- type: from-master
+ type: to-master
width: 4
- name: m_axi_bvalid
- type: from-master
+ type: to-master
width: 4
- name: m_axi_bready
- type: to-master
+ type: from-master
width: 4
- name: m_axi_arid
- type: to-master
+ type: from-master
width: 4
- name: m_axi_araddr
- type: to-master
+ type: from-master
width: 128
- name: m_axi_arlen
- type: to-master
+ type: from-master
width: 32
- name: m_axi_arsize
- type: to-master
+ type: from-master
width: 12
- name: m_axi_arburst
- type: to-master
+ type: from-master
width: 8
- name: m_axi_arlock
- type: to-master
+ type: from-master
width: 4
- name: m_axi_arcache
- type: to-master
+ type: from-master
width: 16
- name: m_axi_arprot
- type: to-master
+ type: from-master
width: 12
- name: m_axi_arqos
- type: to-master
+ type: from-master
width: 16
- name: m_axi_arregion
- type: to-master
+ type: from-master
width: 16
- name: m_axi_aruser
- type: to-master
+ type: from-master
width: 4
- name: m_axi_arvalid
- type: to-master
+ type: from-master
width: 4
- name: m_axi_arready
- type: from-master
+ type: to-master
width: 4
- name: m_axi_rid
- type: from-master
+ type: to-master
width: 4
- name: m_axi_rdata
- type: from-master
+ type: to-master
width: 256
- name: m_axi_rresp
- type: from-master
+ type: to-master
width: 8
- name: m_axi_rlast
- type: from-master
+ type: to-master
width: 4
- name: m_axi_ruser
- type: from-master
+ type: to-master
width: 4
- name: m_axi_rvalid
- type: from-master
+ type: to-master
width: 4
- name: m_axi_rready
- type: to-master
+ type: from-master
width: 4
diff --git a/host/include/uhd/rfnoc/core/n300_bsp.yml b/host/include/uhd/rfnoc/core/n300_bsp.yml
index 7ec2ebc9d..2fdb5804c 100644
--- a/host/include/uhd/rfnoc/core/n300_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n300_bsp.yml
@@ -34,4 +34,4 @@ io_ports:
repl: \1_radio0
dram:
type: axi4_mm_4x64_4g
- drive: master
+ drive: slave
diff --git a/host/include/uhd/rfnoc/core/n310_bsp.yml b/host/include/uhd/rfnoc/core/n310_bsp.yml
index 436e4f860..ff9978e3d 100644
--- a/host/include/uhd/rfnoc/core/n310_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n310_bsp.yml
@@ -46,4 +46,4 @@ io_ports:
repl: \1_radio1
dram:
type: axi4_mm_4x64_4g
- drive: master
+ drive: slave
diff --git a/host/include/uhd/rfnoc/core/n320_bsp.yml b/host/include/uhd/rfnoc/core/n320_bsp.yml
index 5970371a9..334ec9007 100644
--- a/host/include/uhd/rfnoc/core/n320_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n320_bsp.yml
@@ -46,4 +46,4 @@ io_ports:
repl: \1_radio1
dram:
type: axi4_mm_4x64_4g
- drive: master
+ drive: slave
diff --git a/host/include/uhd/rfnoc/core/x300_bsp.yml b/host/include/uhd/rfnoc/core/x300_bsp.yml
index 799a4962b..cecda0e77 100644
--- a/host/include/uhd/rfnoc/core/x300_bsp.yml
+++ b/host/include/uhd/rfnoc/core/x300_bsp.yml
@@ -47,4 +47,4 @@ io_ports:
repl: \1_radio1
dram:
type: axi4_mm_2x64_4g
- drive: master
+ drive: slave
diff --git a/host/include/uhd/rfnoc/core/x310_bsp.yml b/host/include/uhd/rfnoc/core/x310_bsp.yml
index 799a4962b..cecda0e77 100644
--- a/host/include/uhd/rfnoc/core/x310_bsp.yml
+++ b/host/include/uhd/rfnoc/core/x310_bsp.yml
@@ -47,4 +47,4 @@ io_ports:
repl: \1_radio1
dram:
type: axi4_mm_2x64_4g
- drive: master
+ drive: slave