From 4d568cdc1d5cd3c1f8c235881e31dc48900273f9 Mon Sep 17 00:00:00 2001 From: Cyril Koenig Date: Wed, 11 Oct 2023 15:54:31 +0200 Subject: [PATCH] fpga: Updated artifact management to take select only useful envvar --- target/xilinx/xilinx/common.mk | 3 ++- target/xilinx/xilinx/xlnx_clk_wiz/Makefile | 4 +++- target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile | 3 ++- target/xilinx/xilinx/xlnx_mig_ddr4/Makefile | 2 ++ target/xilinx/xilinx/xlnx_vio/Makefile | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/target/xilinx/xilinx/common.mk b/target/xilinx/xilinx/common.mk index 2b847c076..3cd11ccc6 100644 --- 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 diff --git a/target/xilinx/xilinx/xlnx_clk_wiz/Makefile b/target/xilinx/xilinx/xlnx_clk_wiz/Makefile index 70060cea5..38bd62d72 100644 --- 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 \ No newline at end of file +include ../common.mk diff --git a/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile b/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile index 07161ff56..4de35579e 100644 --- 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 \ No newline at end of file +include ../common.mk diff --git a/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile b/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile index 5bd52cca7..aaec632d4 100644 --- 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 index 17949698b..d400c7b8f 100644 --- 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