diff options
author | Andre Heider <a.heider@gmail.com> | 2021-06-08 04:19:59 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-25 13:52:39 +0200 |
commit | b40705b677030c30896917b7d2aa050fe5865605 (patch) | |
tree | 91f92ec564be3280c8fc789e34dd270d3dfd8fa0 /package/boot/arm-trusted-firmware-mvebu/patches/001-imagetool.patch | |
parent | 0c111ce237075c520684542f07f3cfe41f9c94a5 (diff) | |
download | upstream-b40705b677030c30896917b7d2aa050fe5865605.tar.gz upstream-b40705b677030c30896917b7d2aa050fe5865605.tar.bz2 upstream-b40705b677030c30896917b7d2aa050fe5865605.zip |
arm-trusted-firmware-mvebu: update to v2.5
Revert to using the checked in `tbb_linux` image tool binary since building
it drags in the rather big Crypto++ project.
Cherry-pick the post-release UART fixes.
Switch to AUTORELEASE while at it.
Signed-off-by: Andre Heider <a.heider@gmail.com>
Diffstat (limited to 'package/boot/arm-trusted-firmware-mvebu/patches/001-imagetool.patch')
-rw-r--r-- | package/boot/arm-trusted-firmware-mvebu/patches/001-imagetool.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/package/boot/arm-trusted-firmware-mvebu/patches/001-imagetool.patch b/package/boot/arm-trusted-firmware-mvebu/patches/001-imagetool.patch new file mode 100644 index 0000000000..1b4bb09c8c --- /dev/null +++ b/package/boot/arm-trusted-firmware-mvebu/patches/001-imagetool.patch @@ -0,0 +1,20 @@ +--- a/plat/marvell/armada/a3k/common/a3700_common.mk ++++ b/plat/marvell/armada/a3k/common/a3700_common.mk +@@ -76,7 +76,7 @@ $(if $(wildcard $(value WTP)/*),,$(error + $(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 ++DOIMAGETOOL := $(DOIMAGEPATH)/wtptp/linux/tbb_linux + + BUILD_UART := uart-images + UART_IMAGE := $(BUILD_UART).tgz.bin +@@ -132,7 +132,7 @@ TIMBLDUARTARGS := $(MARVELL_SECURE_BOOT + CRYPTOPP_LIBDIR ?= $(CRYPTOPP_PATH) + CRYPTOPP_INCDIR ?= $(CRYPTOPP_PATH) + +-$(DOIMAGETOOL): FORCE ++$(DOIMAGETOOL): + $(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")) + $(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")) + $(if $(wildcard $(CRYPTOPP_LIBDIR)/*),,$(error "Either 'CRYPTOPP_PATH' or 'CRYPTOPP_LIB' was set to '$(CRYPTOPP_LIBDIR)', but '$(CRYPTOPP_LIBDIR)' does not exist")) |