luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed makefiles to use XRAY_DIR 

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
This commit is contained in:
Maciej Kurc 2019-06-19 09:19:28 +02:00
parent bf1c7d3183
commit 64a05b4fa2
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
minitests/litex/src.vivado/Makefile
View File

@ -1,6 +1,5 @@
BASE_PATH = $(abspath $(PWD)/../../../)
PART = xc7a35tcsg324-1 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 all: top.fasm top.bits segprint.log
@ -20,14 +19,14 @@ top.bit: $(VIVADO)
cp build/*.bit ./ cp build/*.bit ./
top.fasm: top.bit top.fasm: top.bit
PYTHONPATH="$(BASE_PATH):$(BASE_PATH)/utils:$(BASE_PATH)/third_party/fasm" \ PYTHONPATH="$(XRAY_DIR):$(XRAY_DIR)/utils:$(XRAY_DIR)/third_party/fasm" \
PATH="$(BASE_PATH)/build/tools:$(PATH)" \ PATH="$(XRAY_DIR)/build/tools:$(PATH)" \
$(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \ $(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \
top.bit >top.fasm \ top.bit >top.fasm \
|| (rm -f top.fasm && exit -1) || (rm -f top.fasm && exit 1)
top.bits: top.bit 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 segprint.log: top.bits
$(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log $(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log

15
minitests/litex/src.yosys/Makefile
View File

@ -1,7 +1,6 @@
BASE_PATH = $(abspath $(PWD)/../../../) YOSYS = $(XRAY_DIR)/third_party/yosys/yosys
YOSYS = $(BASE_PATH)/third_party/yosys/yosys
PART = xc7a35tcsg324-1 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 all: top.fasm top.bits segprint.log
@ -17,7 +16,7 @@ clean:
.PHONY: all clean .PHONY: all clean
$(YOSYS): $(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) top.edif: $(YOSYS)
$(YOSYS) -s synth.ys -l yosys.log $(YOSYS) -s synth.ys -l yosys.log
@ -28,14 +27,14 @@ top.bit: $(VIVADO) top.edif
cp build/*.bit ./ cp build/*.bit ./
top.fasm: top.bit top.fasm: top.bit
PYTHONPATH="$(BASE_PATH):$(BASE_PATH)/utils:$(BASE_PATH)/third_party/fasm" \ PYTHONPATH="$(XRAY_DIR):$(XRAY_DIR)/utils:$(XRAY_DIR)/third_party/fasm" \
PATH="$(BASE_PATH)/build/tools:$(PATH)" \ PATH="$(XRAY_DIR)/build/tools:$(PATH)" \
$(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \ $(XRAY_BIT2FASM) $(BIT2FASM_ARGS) \
top.bit >top.fasm \ top.bit >top.fasm \
|| (rm -f top.fasm && exit -1) || (rm -f top.fasm && exit 1)
top.bits: top.bit 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 segprint.log: top.bits
$(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log $(XRAY_SEGPRINT) -z -D -b top.bits > segprint.log