From bf1c7d31837b1ccf62914ebe9b5d59e4cf1d67e6 Mon Sep 17 00:00:00 2001 From: Maciej Kurc Date: Tue, 18 Jun 2019 13:00:23 +0200 Subject: [PATCH] Fixed invication of prjxray scripts in Makefiles Signed-off-by: Maciej Kurc --- minitests/litex/src.vivado/Makefile | 10 ++++------ minitests/litex/src.yosys/Makefile | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/minitests/litex/src.vivado/Makefile b/minitests/litex/src.vivado/Makefile index d4014f1c..56b94516 100644 --- a/minitests/litex/src.vivado/Makefile +++ b/minitests/litex/src.vivado/Makefile @@ -1,12 +1,12 @@ BASE_PATH = $(abspath $(PWD)/../../../) -VIVADO = $(BASE_PATH)/utils/vivado.sh PART = xc7a35tcsg324-1 -BIT2FASM_ARGS = --db-root "$(BASE_PATH)/database/artix7" --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose +BIT2FASM_ARGS = --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose all: top.fasm top.bits segprint.log clean: @rm -f *.bit + @rm -f *.bin @rm -f *.bits @rm -f *.fasm @rm -f *.log @@ -16,15 +16,13 @@ clean: top.bit: $(VIVADO) mkdir -p build - cd build && $(VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose + cd build && $(XRAY_VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose cp build/*.bit ./ top.fasm: top.bit PYTHONPATH="$(BASE_PATH):$(BASE_PATH)/utils:$(BASE_PATH)/third_party/fasm" \ PATH="$(BASE_PATH)/build/tools:$(PATH)" \ - python3 \ - $(BASE_PATH)/utils/bit2fasm.py \ - $(BIT2FASM_ARGS) \ + $(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \ top.bit >top.fasm \ || (rm -f top.fasm && exit -1) diff --git a/minitests/litex/src.yosys/Makefile b/minitests/litex/src.yosys/Makefile index a22c9da9..649e86d1 100644 --- a/minitests/litex/src.yosys/Makefile +++ b/minitests/litex/src.yosys/Makefile @@ -1,14 +1,14 @@ BASE_PATH = $(abspath $(PWD)/../../../) YOSYS = $(BASE_PATH)/third_party/yosys/yosys -VIVADO = $(BASE_PATH)/utils/vivado.sh PART = xc7a35tcsg324-1 -BIT2FASM_ARGS = --db-root "$(BASE_PATH)/database/artix7" --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose +BIT2FASM_ARGS = --part "$(BASE_PATH)/database/artix7/$(PART)" --verbose all: top.fasm top.bits segprint.log clean: @rm -f *.edif @rm -f *.bit + @rm -f *.bin @rm -f *.bits @rm -f *.fasm @rm -f *.log @@ -24,15 +24,13 @@ top.edif: $(YOSYS) top.bit: $(VIVADO) top.edif mkdir -p build - cd build && $(VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose + cd build && $(XRAY_VIVADO) -mode batch -source ../top.tcl -nojournal -tempDir build -log vivado.log -verbose cp build/*.bit ./ top.fasm: top.bit PYTHONPATH="$(BASE_PATH):$(BASE_PATH)/utils:$(BASE_PATH)/third_party/fasm" \ PATH="$(BASE_PATH)/build/tools:$(PATH)" \ - python3 \ - $(BASE_PATH)/utils/bit2fasm.py \ - $(BIT2FASM_ARGS) \ + $(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \ top.bit >top.fasm \ || (rm -f top.fasm && exit -1)