diff --git a/minitests/roi_harness/arty-common.sh b/minitests/roi_harness/arty-common.sh index 25ad4d97..1da31f77 100644 --- a/minitests/roi_harness/arty-common.sh +++ b/minitests/roi_harness/arty-common.sh @@ -10,7 +10,6 @@ source $(dirname ${BASH_SOURCE[0]})/../../settings/artix7_50t.sh export XRAY_PART=xc7a35tcsg324-1 -export XRAY_EQUIV_PART=xc7a50tfgg484-1 if [ -z "$XRAY_PINCFG" ]; then echo "XRAY_PINCFG not set" @@ -25,15 +24,6 @@ if [ -z "$XRAY_DOUT_N_LARGE" ]; then return 1 fi -# For generating DB -export XRAY_PIN_00="G13" -export XRAY_PIN_01="B11" -export XRAY_PIN_02="E15" -export XRAY_PIN_03="U12" -export XRAY_PIN_04="D13" -export XRAY_PIN_05="J17" -export XRAY_PIN_06="U14" - # HCLK Tile export XRAY_ROI_HCLK="CLK_HROW_TOP_R_X60Y130/CLK_HROW_CK_BUFHCLK_L0" diff --git a/minitests/roi_harness/basys3-common.sh b/minitests/roi_harness/basys3-common.sh index fff53973..cc95e4b6 100644 --- a/minitests/roi_harness/basys3-common.sh +++ b/minitests/roi_harness/basys3-common.sh @@ -10,7 +10,7 @@ source $(dirname ${BASH_SOURCE[0]})/../../settings/artix7_50t.sh export XRAY_PART=xc7a35tcpg236-1 -export XRAY_EQUIV_PART=xc7a50tfgg484-1 + if [ -z "$XRAY_PINCFG" ]; then echo "XRAY_PINCFG not set" return 1 @@ -24,15 +24,6 @@ if [ -z "$XRAY_DOUT_N_LARGE" ]; then return 1 fi -# For generating DB -export XRAY_PIN_00="V17" -export XRAY_PIN_01="V16" -export XRAY_PIN_02="W16" -export XRAY_PIN_03="W17" -export XRAY_PIN_04="W15" -export XRAY_PIN_05="V15" -export XRAY_PIN_06="W14" - # ROI is in the top left export XRAY_ROI_LARGE=SLICE_X0Y100:SLICE_X35Y149 diff --git a/minitests/roi_harness/zybo-common.sh b/minitests/roi_harness/zybo-common.sh index bd244234..aa501d90 100644 --- a/minitests/roi_harness/zybo-common.sh +++ b/minitests/roi_harness/zybo-common.sh @@ -7,7 +7,6 @@ # # SPDX-License-Identifier: ISC export XRAY_PART=xc7z010clg400-1 -export XRAY_EQUIV_PART=xc7z010clg400-1 if [ -z "$XRAY_PINCFG" ]; then echo "XRAY_PINCFG not set" @@ -22,15 +21,6 @@ if [ -z "$XRAY_DOUT_N_LARGE" ]; then return 1 fi -# For generating DB -export XRAY_PIN_00="G15" -export XRAY_PIN_01="P15" -export XRAY_PIN_02="W13" -export XRAY_PIN_03="T16" -export XRAY_PIN_04="K18" -export XRAY_PIN_05="P16" -export XRAY_PIN_06="K19" - # ROI is in top right export XRAY_ROI_LARGE="SLICE_X22Y50:SLICE_X43Y99" diff --git a/settings/artix7.sh b/settings/artix7.sh index 0d2aa2d1..2fe1a117 100644 --- a/settings/artix7.sh +++ b/settings/artix7.sh @@ -31,15 +31,4 @@ export XRAY_ROI_GRID_X2="77" export XRAY_ROI_GRID_Y1="0" export XRAY_ROI_GRID_Y2="51" -# clock pin -export XRAY_PIN_00="Y22" -# data pins -export XRAY_PIN_01="U17" -export XRAY_PIN_02="V17" -export XRAY_PIN_03="V16" -export XRAY_PIN_04="V14" -export XRAY_PIN_05="U14" -export XRAY_PIN_06="U16" - source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh - diff --git a/settings/artix7_200t.sh b/settings/artix7_200t.sh index d5483ea4..c898f331 100644 --- a/settings/artix7_200t.sh +++ b/settings/artix7_200t.sh @@ -21,14 +21,4 @@ export XRAY_EXCLUDE_ROI_TILEGRID="" # If you have a FASM mismatch or unknown bits in IOIs, CHECK THIS FIRST. export XRAY_IOI3_TILES="RIOI3_X105Y9 LIOI3_X0Y9" -# clock pin -export XRAY_PIN_00="R26" -# data pins -export XRAY_PIN_01="P26" -export XRAY_PIN_02="N26" -export XRAY_PIN_03="M27" -export XRAY_PIN_04="U25" -export XRAY_PIN_05="T25" -export XRAY_PIN_06="P24" - source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh diff --git a/settings/artix7_50t.sh b/settings/artix7_50t.sh index d6c93fce..eff26c5a 100644 --- a/settings/artix7_50t.sh +++ b/settings/artix7_50t.sh @@ -30,14 +30,4 @@ export XRAY_ROI_GRID_X2="58" export XRAY_ROI_GRID_Y1="0" export XRAY_ROI_GRID_Y2="51" -# clock pin -export XRAY_PIN_00="E22" -# data pins -export XRAY_PIN_01="D22" -export XRAY_PIN_02="E21" -export XRAY_PIN_03="D21" -export XRAY_PIN_04="G21" -export XRAY_PIN_05="G22" -export XRAY_PIN_06="F21" - source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh diff --git a/settings/kintex7.sh b/settings/kintex7.sh index cf34fd4d..4af4e030 100644 --- a/settings/kintex7.sh +++ b/settings/kintex7.sh @@ -25,13 +25,4 @@ export XRAY_ROI_GRID_X2="38" export XRAY_ROI_GRID_Y1="104" export XRAY_ROI_GRID_Y2="156" -# Choose the first N High Range I/Os -export XRAY_PIN_00="K25" -export XRAY_PIN_01="K26" -export XRAY_PIN_02="L24" -export XRAY_PIN_03="L25" -export XRAY_PIN_04="M19" -export XRAY_PIN_05="M20" -export XRAY_PIN_06="M21" - source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh diff --git a/settings/zynq7.sh b/settings/zynq7.sh index 2e4b115b..94f12845 100644 --- a/settings/zynq7.sh +++ b/settings/zynq7.sh @@ -27,9 +27,4 @@ export XRAY_ROI_GRID_X2="86" export XRAY_ROI_GRID_Y1="105" export XRAY_ROI_GRID_Y2="155" -export XRAY_PIN_00="Y9" -export XRAY_PIN_01="U10" -export XRAY_PIN_02="N17" -export XRAY_PIN_03="P18" - source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh diff --git a/settings/zynq7010.sh b/settings/zynq7010.sh index f1049f0f..9f6f46cc 100644 --- a/settings/zynq7010.sh +++ b/settings/zynq7010.sh @@ -27,12 +27,4 @@ export XRAY_ROI_GRID_X2="118" export XRAY_ROI_GRID_Y1="0" export XRAY_ROI_GRID_Y2="51" -export XRAY_PIN_00="L14" -export XRAY_PIN_01="L15" -export XRAY_PIN_02="M14" -export XRAY_PIN_03="M15" -export XRAY_PIN_04="K16" -export XRAY_PIN_05="J16" -export XRAY_PIN_06="J15" - source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh