aboutsummaryrefslogtreecommitdiffstats
path: root/usrp2/top/u1e
diff options
context:
space:
mode:
authorMatt Ettus <matt@ettus.com>2010-09-23 11:40:19 -0700
committerMatt Ettus <matt@ettus.com>2010-09-23 11:40:19 -0700
commit27eb894c397f758528f59bc24f2ac645f0fccc4b (patch)
treea3833b54e3d5900efcaa40e866a70ec54d4b8ffb /usrp2/top/u1e
parentd78fd935865e3ebece9163a85b4b8043beef4eee (diff)
downloaduhd-27eb894c397f758528f59bc24f2ac645f0fccc4b.tar.gz
uhd-27eb894c397f758528f59bc24f2ac645f0fccc4b.tar.bz2
uhd-27eb894c397f758528f59bc24f2ac645f0fccc4b.zip
watch the ethernet chip select on our debug bus
Diffstat (limited to 'usrp2/top/u1e')
-rw-r--r--usrp2/top/u1e/u1e.ucf2
-rw-r--r--usrp2/top/u1e/u1e.v7
-rw-r--r--usrp2/top/u1e/u1e_core.v5
3 files changed, 8 insertions, 6 deletions
diff --git a/usrp2/top/u1e/u1e.ucf b/usrp2/top/u1e/u1e.ucf
index 5581b1dbd..0c487a601 100644
--- a/usrp2/top/u1e/u1e.ucf
+++ b/usrp2/top/u1e/u1e.ucf
@@ -32,7 +32,7 @@ NET "EM_A<2>" LOC = "A7" ;
NET "EM_A<1>" LOC = "C15" ;
NET "EM_NCS6" LOC = "E17" ;
-#NET "EM_NCS5" LOC = "E10" ;
+NET "EM_NCS5" LOC = "E10" ;
NET "EM_NCS4" LOC = "E6" ;
#NET "EM_NCS1" LOC = "D18" ;
#NET "EM_NCS0" LOC = "D17" ;
diff --git a/usrp2/top/u1e/u1e.v b/usrp2/top/u1e/u1e.v
index ee087e59d..445b14a03 100644
--- a/usrp2/top/u1e/u1e.v
+++ b/usrp2/top/u1e/u1e.v
@@ -8,7 +8,8 @@ module u1e
// GPMC
input EM_CLK, inout [15:0] EM_D, input [10:1] EM_A, input [1:0] EM_NBE,
- input EM_WAIT0, input EM_NCS4, input EM_NCS6, input EM_NWE, input EM_NOE,
+ input EM_WAIT0, input EM_NCS4, input EM_NCS5, input EM_NCS6,
+ input EM_NWE, input EM_NOE,
inout db_sda, inout db_scl, // I2C
@@ -116,8 +117,8 @@ module u1e
.debug_led(debug_led), .debug(debug), .debug_clk(debug_clk),
.debug_txd(FPGA_TXD), .debug_rxd(FPGA_RXD),
.EM_CLK(EM_CLK), .EM_D(EM_D), .EM_A(EM_A), .EM_NBE(EM_NBE),
- .EM_WAIT0(EM_WAIT0), .EM_NCS4(EM_NCS4), .EM_NCS6(EM_NCS6),
- .EM_NWE(EM_NWE), .EM_NOE(EM_NOE),
+ .EM_WAIT0(EM_WAIT0), .EM_NCS4(EM_NCS4), .EM_NCS5(EM_NCS5),
+ .EM_NCS6(EM_NCS6), .EM_NWE(EM_NWE), .EM_NOE(EM_NOE),
.db_sda(db_sda), .db_scl(db_scl),
.sclk(sclk), .sen({cgen_sen_b,sen_codec,db_sen_tx,db_sen_rx}), .mosi(mosi), .miso(miso),
.cgen_st_status(cgen_st_status), .cgen_st_ld(cgen_st_ld),.cgen_st_refmon(cgen_st_refmon),
diff --git a/usrp2/top/u1e/u1e_core.v b/usrp2/top/u1e/u1e_core.v
index 42333a722..619e44b8a 100644
--- a/usrp2/top/u1e/u1e_core.v
+++ b/usrp2/top/u1e/u1e_core.v
@@ -11,7 +11,8 @@ module u1e_core
// GPMC
input EM_CLK, inout [15:0] EM_D, input [10:1] EM_A, input [1:0] EM_NBE,
- input EM_WAIT0, input EM_NCS4, input EM_NCS6, input EM_NWE, input EM_NOE,
+ input EM_WAIT0, input EM_NCS4, input EM_NCS5, input EM_NCS6,
+ input EM_NWE, input EM_NOE,
inout db_sda, inout db_scl,
output sclk, output [7:0] sen, output mosi, input miso,
@@ -439,7 +440,7 @@ module u1e_core
assign debug_clk = { EM_CLK, clk_fpga };
- assign debug = { { rx_have_data, tx_have_space, EM_NCS6, EM_NCS4, EM_NWE, EM_NOE, rx_overrun, tx_underrun },
+ assign debug = { { rx_have_data, tx_have_space, EM_NCS6, EM_NCS5, EM_NCS4, EM_NWE, EM_NOE, rx_overrun },
{ tx_src_rdy, tx_src_rdy_int, tx_dst_rdy, tx_dst_rdy_int, rx_src_rdy, rx_src_rdy_int, rx_dst_rdy, rx_dst_rdy_int },
{ EM_D } };