From 49c8aac143fae89fe66a23c15f91b3f3a3ce5e72 Mon Sep 17 00:00:00 2001
From: Lukasz Dalek <ldalek@antmicro.com>
Date: Fri, 8 Mar 2019 17:15:11 +0100
Subject: [PATCH] zybo: Fix Zybq Zynq-7 roi_harness

Fixed ROI_GRID range and Y_DOUT_BASE. Updated INPUT and OUTPUT pads.

Signed-off-by: Lukasz Dalek <ldalek@antmicro.com>
---
 minitests/roi_harness/runme.tcl | 22 ++++++++++++++++++----
 minitests/roi_harness/zybo.sh   |  2 +-
 settings/zynq7.sh               |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/minitests/roi_harness/runme.tcl b/minitests/roi_harness/runme.tcl
index a385facb..03488f0b 100644
--- a/minitests/roi_harness/runme.tcl
+++ b/minitests/roi_harness/runme.tcl
@@ -78,7 +78,7 @@ set Y_DIN_BASE [expr "$Y_CLK_BASE + $PITCH"]
 # set Y_DOUT_BASE [expr "$Y_DIN_BASE + $DIN_N"]
 # At top. This relieves routing pressure by spreading things out
 # Note: can actually go up one more if we want
-set Y_DOUT_BASE [expr "$XRAY_ROI_Y1 - $DIN_N * $PITCH"]
+set Y_DOUT_BASE [expr "$XRAY_ROI_Y1 - $DOUT_N * $PITCH"]
 
 # Y_OFFSET: offset amount to shift the components on the y column to avoid hard blocks
 set Y_OFFSET 24
@@ -234,9 +234,23 @@ if {$part eq "xc7a50tfgg484-1"} {
     if {$pincfg eq "ZYBOZ7-SWBUT"} {
         # https://github.com/Digilent/digilent-xdc/blob/master/Zybo-Z7-Master.xdc
 
-        # Slide switches and buttons
-        set ins "G15 P15 W13 T16"
-        set outs "M14 M15 G14 D18"
+        #
+        # J15 - UART_RX - JE3
+        # G15 - SW0
+        # K18 - BTN0
+        # K19 - BTN1
+        #
+        set ins  "J15  G15  K18 K19"
+
+        #
+        # H15 - UART_TX - JE4
+        # E17 - ETH PHY reset (active low, keep high for 125 MHz clock)
+        # M14 - LD0
+        # G14 - LD2
+        # M15 - LD1
+        # D18 - LD3
+        #
+        set outs "H15  E17  M14 M15 D18 G14"
 
         # 125 MHz CLK onboard
         set pin "K17"
diff --git a/minitests/roi_harness/zybo.sh b/minitests/roi_harness/zybo.sh
index 9b3772f3..dd1eff9c 100644
--- a/minitests/roi_harness/zybo.sh
+++ b/minitests/roi_harness/zybo.sh
@@ -2,7 +2,7 @@
 export XRAY_PART=xc7z010clg400-1
 export XRAY_PINCFG=ZYBOZ7-SWBUT
 export XRAY_DIN_N_LARGE=4
-export XRAY_DOUT_N_LARGE=4
+export XRAY_DOUT_N_LARGE=6
 
 # For generating DB
 export XRAY_PIN_00="G15"
diff --git a/settings/zynq7.sh b/settings/zynq7.sh
index ef652fcd..64c75b87 100644
--- a/settings/zynq7.sh
+++ b/settings/zynq7.sh
@@ -9,7 +9,7 @@ export XRAY_ROI_TILEGRID="SLICE_X0Y0:SLICE_X43Y99 RAMB18_X0Y0:RAMB18_X2Y39 RAMB3
 export XRAY_ROI="SLICE_X00Y50:SLICE_X43Y99 RAMB18_X0Y20:RAMB18_X2Y39 RAMB36_X0Y10:RAMB36_X2Y19 IOB_X0Y50:IOB_X0Y99"
 
 # Most of CMT X0Y2.
-export XRAY_ROI_GRID_X1="0"
+export XRAY_ROI_GRID_X1="83"
 export XRAY_ROI_GRID_X2="118"
 # Include VBRK / VTERM
 export XRAY_ROI_GRID_Y1="0"