From 4fbcbb5c87e4788db7214e04031d2f355137ab31 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Mon, 24 Feb 2020 23:06:56 -0800 Subject: [PATCH] minitests/litex*: Fix location of clean_json5.py tool. Fixes #1255. Signed-off-by: Tim 'mithro' Ansell --- minitests/litex/min/arty/src.yosys/Makefile | 2 +- minitests/litex/min_ddr/arty/src.yosys/Makefile | 2 +- minitests/litex/src.yosys/Makefile | 2 +- minitests/litex_litedram/src.yosys/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/minitests/litex/min/arty/src.yosys/Makefile b/minitests/litex/min/arty/src.yosys/Makefile index dbbb09ed..1b391bd3 100644 --- a/minitests/litex/min/arty/src.yosys/Makefile +++ b/minitests/litex/min/arty/src.yosys/Makefile @@ -26,7 +26,7 @@ top.edif: $(YOSYS) synth.ys $(SOURCES) top.bit: $(VIVADO) top.edif top.xdc top.tcl mkdir -p build cd build && $(XRAY_VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose - python3 $(XRAY_DIR)/minitests/timing/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json + python3 $(XRAY_UTILS_DIR)/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json cp build/*.bit ./ top.fasm: top.bit diff --git a/minitests/litex/min_ddr/arty/src.yosys/Makefile b/minitests/litex/min_ddr/arty/src.yosys/Makefile index 059bb501..12ca5b8f 100644 --- a/minitests/litex/min_ddr/arty/src.yosys/Makefile +++ b/minitests/litex/min_ddr/arty/src.yosys/Makefile @@ -27,7 +27,7 @@ top.edif: $(YOSYS) synth.ys $(SOURCES) top.bit: $(VIVADO) top.edif top.xdc top.tcl mkdir -p build cd build && $(XRAY_VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose - python3 $(XRAY_DIR)/minitests/timing/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json + python3 $(XRAY_UTILS_DIR)/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json cp build/*.bit ./ top.fasm: top.bit diff --git a/minitests/litex/src.yosys/Makefile b/minitests/litex/src.yosys/Makefile index 027afe8c..04a810bc 100644 --- a/minitests/litex/src.yosys/Makefile +++ b/minitests/litex/src.yosys/Makefile @@ -25,7 +25,7 @@ top.edif: $(YOSYS) synth.ys $(SOURCES) top.bit: $(VIVADO) top.edif top.xdc top.tcl mkdir -p build cd build && $(XRAY_VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose - python3 $(XRAY_DIR)/minitests/timing/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json + python3 $(XRAY_UTILS_DIR)/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json cp build/*.bit ./ top.fasm: top.bit diff --git a/minitests/litex_litedram/src.yosys/Makefile b/minitests/litex_litedram/src.yosys/Makefile index bacb847b..69cd5be8 100644 --- a/minitests/litex_litedram/src.yosys/Makefile +++ b/minitests/litex_litedram/src.yosys/Makefile @@ -25,7 +25,7 @@ top.edif: $(YOSYS) synth.ys $(SOURCES) top.bit: $(VIVADO) $(SOURCES) top.xdc top.tcl mkdir -p build cd build && $(XRAY_VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose - python3 $(XRAY_DIR)/minitests/timing/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json + python3 $(XRAY_UTILS_DIR)/clean_json5.py < build/iobuf_report.json5 > build/iobuf_report.json cp build/*.bit ./ top.fasm: top.bit