fpga: Updated artifact management to take select only useful envvar

pulp-platform · Jan 26, 2024 · 74d38fa · 74d38fa
1 parent b238548
commit 74d38fa
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 4 deletions.
diff --git a/sw/boot/cheshire_genesys2.dts → sw/boot/cheshire_vanilla_genesys2.dts b/sw/boot/cheshire_genesys2.dts → sw/boot/cheshire_vanilla_genesys2.dts
diff --git a/sw/boot/cheshire_vcu128.dts → sw/boot/cheshire_vanilla_vcu128.dts b/sw/boot/cheshire_vcu128.dts → sw/boot/cheshire_vanilla_vcu128.dts
diff --git a/sw/deps/cva6-sdk b/sw/deps/cva6-sdk
diff --git a/sw/sw.mk b/sw/sw.mk
@@ -139,6 +139,10 @@ $(foreach link,$(patsubst $(CHS_SW_LD_DIR)/%.ld,%,$(wildcard $(CHS_SW_LD_DIR)/*.
 # Images from CVA6 SDK (built externally)
 CHS_CVA6_SDK_IMGS ?= $(addprefix $(CHS_SW_DIR)/deps/cva6-sdk/install64/,fw_payload.bin uImage)
 
+$(CHS_CVA6_SDK_IMGS):
+	@echo "Linux images are missing, did you build the CVA6 SDK?"
+	exit 1
+
 # Create full Linux disk image
 $(CHS_SW_DIR)/boot/linux-%.gpt.bin: $(CHS_SW_DIR)/boot/zsl.rom.bin $(CHS_SW_DIR)/boot/cheshire_%.dtb $(CHS_CVA6_SDK_IMGS)
 	truncate -s $(CHS_SW_DISK_SIZE) $@

diff --git a/target/xilinx/xilinx/common.mk b/target/xilinx/xilinx/common.mk
@@ -31,7 +31,8 @@ $(PROJECT).xpr:
 
 # Generate a sha based on env variables and artifacts_in
 generate_sha256:
-	@echo $(VIVADOENV) $(VIVADO) $(PROJECT) $(ARTIFACTS_IN) > .generated_env
+	@echo $(VIVADO) $(PROJECT) > .generated_env
+	@echo $(VIVADOENV) | tr " " "\n" | grep $(foreach var,$(ARTIFACTS_VARS), $(addprefix -e ,$(var)))  >> .generated_env
 	@sha256sum $(ARTIFACTS_IN) >> .generated_env
 	@sha256sum .generated_env | awk '{print $$1}' > .generated_sha256
 
@@ -46,6 +47,7 @@ load-artifacts: .generated_sha256
 save-artifacts: generate_sha256 load-artifacts $(PROJECT).xpr
 	@if [ ! -d "$(ARTIFACTS_PATH)/`cat .generated_sha256`" ]; then \
 		cp -r . $(ARTIFACTS_PATH)/`cat .generated_sha256`; \
+		chmod -R o+rw $(ARTIFACTS_PATH)/`cat .generated_sha256`; \
 	fi
 
 gui:

diff --git a/target/xilinx/xilinx/xlnx_clk_wiz/Makefile b/target/xilinx/xilinx/xlnx_clk_wiz/Makefile
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 PROJECT:=xlnx_clk_wiz
+# The files and variables on which the IP configuration depends
 ARTIFACTS_IN:=Makefile tcl/run.tcl
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
-include ../common.mk
+include ../common.mk
diff --git a/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile b/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile
@@ -4,5 +4,6 @@
 
 PROJECT:=xlnx_mig_7_ddr3
 ARTIFACTS_IN:=Makefile tcl/run.tcl mig_genesys2.prj mig_kc705.prj mig_vc707.prj
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
-include ../common.mk
+include ../common.mk
diff --git a/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile b/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 PROJECT:=xlnx_mig_ddr4
+# The files and variables on which the IP configuration depends
 ARTIFACTS_IN:=Makefile tcl/run.tcl
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
 include ../common.mk
diff --git a/target/xilinx/xilinx/xlnx_vio/Makefile b/target/xilinx/xilinx/xlnx_vio/Makefile
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 PROJECT:=xlnx_vio
+# The files and variables on which the IP configuration depends
 ARTIFACTS_IN:=Makefile tcl/run.tcl
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
 include ../common.mk
+1 −1		Makefile
+1 −1		opensbi
+1 −0		rootfs/etc/profile.d/helloworld.sh
+1 −1		u-boot