diff options
| author | Pali Rohár <pali@kernel.org> | 2021-01-26 10:44:07 +0100 |
|---|---|---|
| committer | Pali Rohár <pali@kernel.org> | 2021-01-28 14:19:32 +0100 |
| commit | edb4a8a29430772bc9db25e6cb5f9386b42b1162 (patch) | |
| tree | 9b88d1afad8816933420ae33f19164487685c85a | |
| parent | 1cea02133f84148575687b0f2d0b953a01b9015d (diff) | |
| download | platform_external_arm-trusted-firmware-edb4a8a29430772bc9db25e6cb5f9386b42b1162.tar.gz platform_external_arm-trusted-firmware-edb4a8a29430772bc9db25e6cb5f9386b42b1162.tar.bz2 platform_external_arm-trusted-firmware-edb4a8a29430772bc9db25e6cb5f9386b42b1162.zip | |
plat: marvell: armada: a3k: Add checks that WTP, MV_DDR_PATH and CRYPTOPP_PATH are correctly defined
These variables must contain a path to a valid directory (not a file) which
really exists. Also WTP and MV_DDR_PATH must point to either a valid Marvell
release tarball or git repository.
Signed-off-by: Pali Rohár <pali@kernel.org>
Change-Id: I1ad80c41092cf3ea6a625426df62b7d9d6f37815
| -rw-r--r-- | plat/marvell/armada/a3k/common/a3700_common.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plat/marvell/armada/a3k/common/a3700_common.mk b/plat/marvell/armada/a3k/common/a3700_common.mk index 824a3c690..452d9d220 100644 --- a/plat/marvell/armada/a3k/common/a3700_common.mk +++ b/plat/marvell/armada/a3k/common/a3700_common.mk @@ -71,6 +71,9 @@ endif ifdef WTP +$(if $(wildcard $(value WTP)/*),,$(error "'WTP=$(value WTP)' was specified, but '$(value WTP)' directory does not exist")) +$(if $(shell test -s "$(value WTP)/branch.txt" || git -C $(value WTP) rev-parse --show-cdup 2>&1),$(error "'WTP=$(value WTP)' was specified, but '$(value WTP)' does not contain valid Marvell a3700_utils release tarball nor git repository")) + DOIMAGEPATH := $(WTP) DOIMAGETOOL := $(DOIMAGEPATH)/wtptp/src/TBB_Linux/release/TBB_linux @@ -130,6 +133,7 @@ DOIMAGE_FLAGS := -r $(DOIMAGE_CFG) -v -D $(DOIMAGETOOL): FORCE $(if $(value CRYPTOPP_PATH),,$(error "Platform '${PLAT}' for WTP image tool requires CRYPTOPP_PATH. Please set CRYPTOPP_PATH to point to the right directory")) + $(if $(wildcard $(value CRYPTOPP_PATH)/*),,$(error "'CRYPTOPP_PATH=$(value CRYPTOPP_PATH)' was specified, but '$(value CRYPTOPP_PATH)' directory does not exist")) $(Q)$(MAKE) --no-print-directory -C $(CRYPTOPP_PATH) -f GNUmakefile $(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH)/wtptp/src/TBB_Linux -f TBB_linux.mak LIBDIR=$(CRYPTOPP_PATH) @@ -138,6 +142,8 @@ $(WTMI_MULTI_IMG): FORCE $(TIMDDRTOOL): FORCE $(if $(value MV_DDR_PATH),,$(error "Platform '${PLAT}' for ddr tool requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) + $(if $(shell test -s "$(value MV_DDR_PATH)/branch.txt" || git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid Marvell mv_ddr release tarball nor git repository")) $(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH) MV_DDR_PATH=$(MV_DDR_PATH) mv_ddr .PHONY: mrvl_flash |