From 64a05b4fa21d858c4d7a9729aa47dfd798ac287e Mon Sep 17 00:00:00 2001
From: Maciej Kurc <mkurc@antmicro.com>
Date: Wed, 19 Jun 2019 09:19:28 +0200
Subject: [PATCH] Changed makefiles to use XRAY_DIR

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
---
 minitests/litex/src.vivado/Makefile | 11 +++++------
 minitests/litex/src.yosys/Makefile  | 15 +++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/minitests/litex/src.vivado/Makefile b/minitests/litex/src.vivado/Makefile
index 56b94516..442afb8b 100644
--- a/minitests/litex/src.vivado/Makefile
+++ b/minitests/litex/src.vivado/Makefile
@@ -1,6 +1,5 @@
-BASE_PATH = $(abspath $(PWD)/../../../)
 PART = xc7a35tcsg324-1
-BIT2FASM_ARGS = --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose
+BIT2FASM_ARGS = --part "$(XRAY_DIR)/database/artix7/$(PART)" --verbose
 
 all: top.fasm top.bits segprint.log
 
@@ -20,14 +19,14 @@ top.bit: $(VIVADO)
 	cp build/*.bit ./
 
 top.fasm: top.bit
-	PYTHONPATH="$(BASE_PATH):$(BASE_PATH)/utils:$(BASE_PATH)/third_party/fasm" \
-    PATH="$(BASE_PATH)/build/tools:$(PATH)" \
+	PYTHONPATH="$(XRAY_DIR):$(XRAY_DIR)/utils:$(XRAY_DIR)/third_party/fasm" \
+    PATH="$(XRAY_DIR)/build/tools:$(PATH)" \
     $(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \
         top.bit >top.fasm \
-        || (rm -f top.fasm && exit -1)
+        || (rm -f top.fasm && exit 1)
 
 top.bits: top.bit
-	$(XRAY_BITREAD) -part_file $(BASE_PATH)/database/artix7/$(PART).yaml -o top.bits -z -y top.bit
+	$(XRAY_BITREAD) -part_file $(XRAY_DIR)/database/artix7/$(PART).yaml -o top.bits -z -y top.bit
 
 segprint.log: top.bits
 	$(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log
diff --git a/minitests/litex/src.yosys/Makefile b/minitests/litex/src.yosys/Makefile
index 649e86d1..11e6b4c6 100644
--- a/minitests/litex/src.yosys/Makefile
+++ b/minitests/litex/src.yosys/Makefile
@@ -1,7 +1,6 @@
-BASE_PATH = $(abspath $(PWD)/../../../)
-YOSYS = $(BASE_PATH)/third_party/yosys/yosys
+YOSYS = $(XRAY_DIR)/third_party/yosys/yosys
 PART = xc7a35tcsg324-1
-BIT2FASM_ARGS = --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose
+BIT2FASM_ARGS = --part "$(XRAY_DIR)/database/artix7/$(PART)" --verbose
 
 all: top.fasm top.bits segprint.log
 
@@ -17,7 +16,7 @@ clean:
 .PHONY: all clean
 
 $(YOSYS):
-	cd $(BASE_PATH)/third_party/yosys && make config-gcc && make -j$(shell nproc)
+	cd $(XRAY_DIR)/third_party/yosys && make config-gcc && make -j$(shell nproc)
 
 top.edif: $(YOSYS)
 	$(YOSYS) -s synth.ys -l yosys.log
@@ -28,14 +27,14 @@ top.bit: $(VIVADO) top.edif
 	cp build/*.bit ./
 
 top.fasm: top.bit
-	PYTHONPATH="$(BASE_PATH):$(BASE_PATH)/utils:$(BASE_PATH)/third_party/fasm" \
-    PATH="$(BASE_PATH)/build/tools:$(PATH)" \
+	PYTHONPATH="$(XRAY_DIR):$(XRAY_DIR)/utils:$(XRAY_DIR)/third_party/fasm" \
+    PATH="$(XRAY_DIR)/build/tools:$(PATH)" \
     $(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \
         top.bit >top.fasm \
-        || (rm -f top.fasm && exit -1)
+        || (rm -f top.fasm && exit 1)
 
 top.bits: top.bit
-	$(XRAY_BITREAD) -part_file $(BASE_PATH)/database/artix7/$(PART).yaml -o top.bits -z -y top.bit
+	$(XRAY_BITREAD) -part_file $(XRAY_DIR)/database/artix7/$(PART).yaml -o top.bits -z -y top.bit
 
 segprint.log: top.bits
 	$(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log