better debug pins

2 files changed, 11 insertions, 7 deletions

diff --git a/usrp2/top/u1e_ethdebug/u1e.ucf b/usrp2/top/u1e_ethdebug/u1e.ucf
index 0d4384a2a..d6a2ea4ed 100644
--- a/usrp2/top/u1e_ethdebug/u1e.ucf
+++ b/usrp2/top/u1e_ethdebug/u1e.ucf
@@ -36,12 +36,14 @@ NET "EM_NCS4"  LOC = "E6"  ;
 
 NET "EM_CLK"  LOC = "F11"  ;
 NET "EM_WAIT0"  LOC = "F14"  ;
-NET "EM_NBE<1>"  LOC = "D14"  ;
-NET "EM_NBE<0>"  LOC = "A13"  ;
+#NET "EM_NBE<1>"  LOC = "D14"  ;
+#NET "EM_NBE<0>"  LOC = "A13"  ;
 NET "EM_NWE"  LOC = "B13"  ;
 NET "EM_NOE"  LOC = "A14"  ;
 NET "EM_NADV_ALE"  LOC = "B15"  ;
-NET "EM_NWP"  LOC = "F13"  ;
+#NET "EM_NWP"  LOC = "F13"  ;
+NET "overo_gpio64"  LOC = "A4"  ;  # nRESET
+NET "overo_gpio176"  LOC = "B4"  ;  # IRQ
 
 ## Debug pins
 NET "debug_led<3>"  LOC = "Y15"  ;
diff --git a/usrp2/top/u1e_ethdebug/u1e.v b/usrp2/top/u1e_ethdebug/u1e.v
index c4740b941..2a543a313 100644
--- a/usrp2/top/u1e_ethdebug/u1e.v
+++ b/usrp2/top/u1e_ethdebug/u1e.v
@@ -8,16 +8,18 @@ module u1e
    input debug_pb,
 
    // GPMC
-   input EM_CLK, input [15:0] EM_D, input [10:1] EM_A, input [1:0] EM_NBE,
+   input EM_CLK, input [15:0] EM_D, input [10:1] EM_A,
    input EM_WAIT0, input EM_NCS4, input EM_NCS5, input EM_NCS6, input EM_NWE, input EM_NOE,
-   input EM_NADV_ALE, input EM_NWP
+   input EM_NADV_ALE,
+
+   input overo_gpio64, input overo_gpio176
    );
 
    assign debug_clk = {EM_CLK, EM_NADV_ALE};
 
-   assign debug_led = {EM_NWP, EM_A[9], EM_A[8], debug_pb};
+   assign debug_led = {1'b0, EM_A[9], EM_A[8], debug_pb};
 
-   assign debug = { { EM_NBE[1:0], EM_WAIT0, EM_NCS4, EM_NCS5, EM_NCS6, EM_NWE, EM_NOE },
+   assign debug = { {overo_gpio64, overo_gpio176, EM_WAIT0, EM_NCS4, EM_NCS5, EM_NCS6, EM_NWE, EM_NOE },
 		    { EM_A[10], EM_A[7:1] },
 		    { EM_D[15:8] },
 		    { EM_D[7:0] } };