From 9be069214fc805333992e83f823b273057292cda Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 29 Jan 2021 19:16:11 +0100 Subject: [PATCH] minitest: litepcie: source XRAY_VIVADO_SETTINGS Signed-off-by: Alessandro Comodi --- minitests/litex/litepcie/.gitignore | 2 +- minitests/litex/litepcie/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/minitests/litex/litepcie/.gitignore b/minitests/litex/litepcie/.gitignore index f8a8c52c..72fbcb57 100644 --- a/minitests/litex/litepcie/.gitignore +++ b/minitests/litex/litepcie/.gitignore @@ -1,5 +1,5 @@ # Build data -build* +build *.fasm *.ok diff --git a/minitests/litex/litepcie/Makefile b/minitests/litex/litepcie/Makefile index d7fe3589..7f43ac76 100644 --- a/minitests/litex/litepcie/Makefile +++ b/minitests/litex/litepcie/Makefile @@ -15,7 +15,7 @@ RISCV_DIR = riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14 all: $(PROJECT_NAME).fasm clean: - @rm -rf build* + @rm -rf build @rm -f *.fasm clean_litex: @@ -40,7 +40,9 @@ riscv-gcc.ok: touch riscv-gcc.ok build/netv2/gateware/netv2.bit: litex-install.ok riscv-gcc.ok - env PATH=${PATH}:${PWD}/${RISCV_DIR}/bin ${VIRTUAL_ENV}/src/litex-boards/litex_boards/targets/netv2.py --with-pcie --variant a7-100 --build + export PATH=${PATH}:${PWD}/${RISCV_DIR}/bin && \ + source ${XRAY_VIVADO_SETTINGS} && \ + ${VIRTUAL_ENV}/src/litex-boards/litex_boards/targets/netv2.py --with-pcie --variant a7-100 --build $(PROJECT_NAME).fasm: build/netv2/gateware/netv2.bit source $(XRAY_DIR)/settings/artix7.sh && env XRAY_PART=$(PART) ${XRAY_BIT2FASM} --verbose build/netv2/gateware/netv2.bit > $(PROJECT_NAME).fasm