From 4a0ca410773a0fa57b292f415134aea0bf73fcc0 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Tue, 21 Jan 2020 16:21:15 +0100 Subject: [PATCH] roi_only: copy tilegrid and tileconn from equivalent part 005-tilegrid fuzzer cannot run for some parts as some of the IOBs are not available, therefore the fuzzer exits with errors. Instead, the tilegrid is copied from the specified equivalent part. Signed-off-by: Alessandro Comodi --- fuzzers/Makefile | 5 +++-- minitests/roi_harness/arty-common.sh | 1 + minitests/roi_harness/basys3-common.sh | 1 + minitests/roi_harness/zybo-common.sh | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fuzzers/Makefile b/fuzzers/Makefile index fc74633a..addf2671 100644 --- a/fuzzers/Makefile +++ b/fuzzers/Makefile @@ -169,9 +169,10 @@ roi_only: mkdir -p ${XRAY_FAMILY_DIR}/${XRAY_PART} # Generate YAML +$(MAKE) part_only_yaml - # Generate Tile grid - +$(MAKE) part_only_tilegrid # Generate package pins +$(MAKE) part_only_pins + # Copy tilegrid and tileconn + cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tilegrid.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tilegrid.json + cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tileconn.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tileconn.json .PHONY: all clean clean_fuzzers clean_logs quick part_only roi_only diff --git a/minitests/roi_harness/arty-common.sh b/minitests/roi_harness/arty-common.sh index 2a3145c6..9da02714 100644 --- a/minitests/roi_harness/arty-common.sh +++ b/minitests/roi_harness/arty-common.sh @@ -1,5 +1,6 @@ # XC7A35TICSG324-1L export XRAY_PART=xc7a35tcsg324-1 +export XRAY_EQUIV_PART=xc7a50tfgg484-1 if [ -z "$XRAY_PINCFG" ]; then echo "XRAY_PINCFG not set" diff --git a/minitests/roi_harness/basys3-common.sh b/minitests/roi_harness/basys3-common.sh index a76c8653..8047f822 100644 --- a/minitests/roi_harness/basys3-common.sh +++ b/minitests/roi_harness/basys3-common.sh @@ -1,5 +1,6 @@ # XC7A35T-1CPG236C export XRAY_PART=xc7a35tcpg236-1 +export XRAY_EQUIV_PART=xc7a50tfgg484-1 if [ -z "$XRAY_PINCFG" ]; then echo "XRAY_PINCFG not set" return 1 diff --git a/minitests/roi_harness/zybo-common.sh b/minitests/roi_harness/zybo-common.sh index 1aa60baf..408eed54 100644 --- a/minitests/roi_harness/zybo-common.sh +++ b/minitests/roi_harness/zybo-common.sh @@ -1,5 +1,6 @@ # XC7010-1CLG400C export XRAY_PART=xc7z010clg400-1 +export XRAY_EQUIV_PART=xc7z010clg400-1 if [ -z "$XRAY_PINCFG" ]; then echo "XRAY_PINCFG not set"