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

Fixed invication of prjxray scripts in Makefiles 

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
This commit is contained in:
Maciej Kurc 2019-06-18 13:00:23 +02:00
parent 728a6a76d2
commit bf1c7d3183
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

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

@ -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)