miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e31x: Minor cleanup on top-level e31x.v module

Browse Source 
- Fixed some incorrect comments
- Fixed some missing wire declarations for internal NIC
- Fix wire declarations for GPIO (they were declared too late)


Original-commit: b18eaa75de2d1dcba2a1be0ee0b862a57e976cca
This commit is contained in:
Martin Braun
2020-07-18 13:33:42 -05:00
committed by Wade Fife
parent 8ad22c51e3
commit b923e1bb2c
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
top/e31x/e31x.v
+12 -11
View File
@@ -130,7 +130,7 @@ module e31x (
output TCXO_DAC_SDIN,
input TCXO_CLK,
// gpios, change to inout somehow
// Internal GPIOs (INT0)
inout [5:0] PL_GPIO
);
@@ -170,7 +170,9 @@ module e31x (
//ETH DMA
wire m_axi_eth_internal_arvalid;
wire m_axi_eth_internal_arready;
wire m_axi_eth_internal_awvalid;
wire m_axi_eth_internal_awready;
wire m_axi_eth_internal_bready;
wire m_axi_eth_internal_rready;
wire m_axi_eth_internal_wvalid;
@@ -181,6 +183,7 @@ module e31x (
wire m_axi_eth_internal_rvalid;
wire m_axi_eth_internal_wready;
wire [1:0] m_axi_eth_internal_bresp;
wire m_axi_eth_internal_bvalid;
wire [1:0] m_axi_eth_internal_rresp;
wire [31:0] m_axi_eth_internal_rdata;
@@ -251,6 +254,11 @@ module e31x (
wire s_axis_dma_tready;
wire s_axis_dma_tvalid;
// GPIO
wire [63:0] ps_gpio_in;
wire [63:0] ps_gpio_out;
wire [63:0] ps_gpio_tri;
//Misc
wire [15:0] device_id;
@@ -462,10 +470,6 @@ module e31x (
//
//////////////////////////////////////////////////////////////////////
wire [63:0] ps_gpio_in;
wire [63:0] ps_gpio_out;
wire [63:0] ps_gpio_tri;
e31x_ps_bd e31x_ps_bd_inst (
// DDR Interface
@@ -815,12 +819,9 @@ module e31x (
/////////////////////////////////////////////////////////////////////
//
// E320 Core:
// - xbar
// - Radio
// - DMA
// - DRAM
// - CEs
// E310 Core:
// - RFNoC Image Core (incl. radio, RFNoC blocks, etc.)
// - Other RFNoC controls
//
//////////////////////////////////////////////////////////////////////
top/e31x/e31x_core.v
+1 -3
View File
@@ -8,9 +8,7 @@
// Module: e31x_core
// Description:
// - Motherboard Registers
// - Crossbar
// - Noc Block Radio
// - Noc Block Dram Fifo
// - RFNoC Image Core + Blocks
// - Radio Front End control
//
/////////////////////////////////////////////////////////////////////