arm-trusted-firmware-mvebu: update to v2.5
[openwrt/staging/stintel.git] / package / boot / arm-trusted-firmware-mvebu / patches / 001-imagetool.patch
1 --- a/plat/marvell/armada/a3k/common/a3700_common.mk
2 +++ b/plat/marvell/armada/a3k/common/a3700_common.mk
3 @@ -76,7 +76,7 @@ $(if $(wildcard $(value WTP)/*),,$(error
4 $(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"))
5
6 DOIMAGEPATH := $(WTP)
7 -DOIMAGETOOL := $(DOIMAGEPATH)/wtptp/src/TBB_Linux/release/TBB_linux
8 +DOIMAGETOOL := $(DOIMAGEPATH)/wtptp/linux/tbb_linux
9
10 BUILD_UART := uart-images
11 UART_IMAGE := $(BUILD_UART).tgz.bin
12 @@ -132,7 +132,7 @@ TIMBLDUARTARGS := $(MARVELL_SECURE_BOOT
13 CRYPTOPP_LIBDIR ?= $(CRYPTOPP_PATH)
14 CRYPTOPP_INCDIR ?= $(CRYPTOPP_PATH)
15
16 -$(DOIMAGETOOL): FORCE
17 +$(DOIMAGETOOL):
18 $(if $(CRYPTOPP_LIBDIR),,$(error "Platform '$(PLAT)' for WTP image tool requires CRYPTOPP_PATH or CRYPTOPP_LIBDIR. Please set CRYPTOPP_PATH or CRYPTOPP_LIBDIR to point to the right directory"))
19 $(if $(CRYPTOPP_INCDIR),,$(error "Platform '$(PLAT)' for WTP image tool requires CRYPTOPP_PATH or CRYPTOPP_INCDIR. Please set CRYPTOPP_PATH or CRYPTOPP_INCDIR to point to the right directory"))
20 $(if $(wildcard $(CRYPTOPP_LIBDIR)/*),,$(error "Either 'CRYPTOPP_PATH' or 'CRYPTOPP_LIB' was set to '$(CRYPTOPP_LIBDIR)', but '$(CRYPTOPP_LIBDIR)' does not exist"))