DNF package change in makefile

chaseklvk · Jun 16, 2022 · b5aa4a5 · b5aa4a5
1 parent 07f2ed1
commit b5aa4a5
Show file tree

Hide file tree

Showing 207 changed files with 137 additions and 1,468 deletions.
diff --git a/common/utility/makefile_gen/makegen.py b/common/utility/makefile_gen/makegen.py
@@ -125,16 +125,14 @@ def mk_run(target, data):
     target.write("endif\n")
     target.write("\n")
 
-    makefile_lst = ["makegen_us_alveo.py" , "makegen_versal_alveo.py", "makegen_versal_ps.py", "makegen_zynqmp.py", "makegen_zynq7000.py"]
+    makefile_lst = ["makegen_us_alveo.py" , "makegen_versal_alveo.py", "makegen_versal_ps.py", "makegen_zynqmp.py"]
 
     blocklist = [board for board in data.get("platform_blocklist", [])]
     if ("platform_type" in data and data["platform_type"] == "pcie"):
       makefile_lst.remove("makegen_versal_ps.py")
       makefile_lst.remove("makegen_zynqmp.py")
-      makefile_lst.remove("makegen_zynq7000.py")
     if "zc" in blocklist:
       if "makegen_zynqmp.py" in makefile_lst : makefile_lst.remove("makegen_zynqmp.py")
-      if "makegen_zynq7000.py" in makefile_lst : makefile_lst.remove("makegen_zynq7000.py")
     if "vck" in blocklist:
       if "makegen_versal_ps.py" in makefile_lst : makefile_lst.remove("makegen_versal_ps.py")
       makefile_lst.remove("makegen_versal_alveo.py")
@@ -157,8 +155,6 @@ def mk_run(target, data):
     elif "dma" in blocklist:
       target.write("ifeq ($(DEV_ARCH), zynquplus)\n")
       target.write("include makefile_zynqmp.mk\n")
-      target.write("else ifeq ($(DEV_ARCH), zynq)\n")
-      target.write("include makefile_zynq7000.mk\n")
       target.write("else ifeq ($(DEV_ARCH), versal)\n")
       target.write("include makefile_versal_ps.mk\n")
       target.write("endif\n")
@@ -169,8 +165,6 @@ def mk_run(target, data):
       target.write("else\n")
       target.write("include makefile_us_alveo.mk\n")
       target.write("endif\n")
-      target.write("else ifeq ($(DEV_ARCH), zynq)\n")
-      target.write("include makefile_zynq7000.mk\n")
       target.write("else ifeq ($(DEV_ARCH), versal)\n")
       target.write("ifeq ($(HOST_ARCH), x86)\n")
       target.write("include makefile_versal_alveo.mk\n")

diff --git a/common/utility/makefile_gen/makegen_versal_ps.py b/common/utility/makefile_gen/makegen_versal_ps.py
@@ -73,7 +73,7 @@ def create_params(target,data):
         target.write("\n\n")    
     target.write("CXXFLAGS += -I$(SYSROOT)/usr/include/xrt -I$(XILINX_VIVADO)/include -Wall -O0 -g -std=c++1y\n")
     target.write("LDFLAGS += -L$(SYSROOT)/usr/lib -pthread -lxilinxopencl\n")
-
+    target.write("VPP_PFLAGS+=--package.sd_dir /proj/xbuilds/2022.2_daily_latest/internal_platforms/sw/versal/xrt\n")
     blocklist = [board for board in data.get("platform_blocklist", [])]
     forbid_others = False
     target.write("\n########################## Checking if PLATFORM in allowlist #######################\n")