diff --git a/Computer_Systems/DE1-SoC/scripts/paths.mk b/Computer_Systems/DE1-SoC/scripts/paths.mk index 2bb6092..2940aaa 100644 --- a/Computer_Systems/DE1-SoC/scripts/paths.mk +++ b/Computer_Systems/DE1-SoC/scripts/paths.mk @@ -9,6 +9,8 @@ RELPATH = ../rel/DE1-SoC/$(QP_NAME)/. S2CPATH = ../../common/scripts # The relative path the common scripts directory as compared to the destination directory D2CPATH = ../../../common/scripts +# Path qsys-script and qsys-generate will search through for additional IP +IPSEARCHPATH = ../src/ip/**/* include $(S2CPATH)/common.mk diff --git a/Computer_Systems/common/scripts/common.mk b/Computer_Systems/common/scripts/common.mk index 26981b1..87d9f3c 100644 --- a/Computer_Systems/common/scripts/common.mk +++ b/Computer_Systems/common/scripts/common.mk @@ -20,12 +20,12 @@ generate_qsys_files: $(QSYSOBJS) %.tcl: # dummy make target %.qsys: %.tcl - qsys-script$(EXE) --script=$(S2CPATH)/$< > $(CURPATH)/o_$<.txt 2>&1 + qsys-script$(EXE) --script=$(S2CPATH)/$< --search-path=$(IPSEARCHPATH),$$ > $(CURPATH)/o_$<.txt 2>&1 run_platform_designer: $(QSYSSRC) mkdir -p $(DSTPATH) cp *.qsys $(DSTPATH) - cd $(DSTPATH) && qsys-generate$(EXE) ./$< --synthesis=VERILOG > $(CURPATH)/o_$<.txt 2>&1 + cd $(DSTPATH) && qsys-generate$(EXE) ./$< --search-path=../$(IPSEARCHPATH),$$ --synthesis=VERILOG > $(CURPATH)/o_$<.txt 2>&1 reduce_sopcinfo: cd $(DSTPATH) && python3 $(D2CPATH)/strip_info.py Computer_System.sopcinfo