From ee80ab8dc673f802f698693bd888e1123e58219e Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Wed, 10 Aug 2022 19:55:51 +0200
Subject: [PATCH] f4pga/wrappers/sh/xc7: cleanup

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh         | 12 ------------
 f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh |  6 +++++-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh b/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh
index cf40f84..7f12307 100755
--- a/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh
+++ b/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh
@@ -145,15 +145,3 @@ function run_genfasm {
 
      return $?
 }
-
-function run_vpr_xml_rr_graph {
-     set -e
-
-     vpr ${ARCH_DEF} \
-          ${EBLIF} \
-          --read_rr_graph ${RR_GRAPH}
-          --write_rr_graph ${RR_GRAPH_XML}
-          $@
-
-     return $?
-}
diff --git a/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh b/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh
index 2cf9aae..7b5f929 100755
--- a/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh
+++ b/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh
@@ -23,4 +23,8 @@ parse_args "$@"
 
 OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_place.log
 
-run_vpr_xml_rr_graph --pack
+vpr ${ARCH_DEF} \
+  ${EBLIF} \
+  --read_rr_graph ${RR_GRAPH} \
+  --write_rr_graph ${RR_GRAPH_XML} \
+  --pack