From 65c1c91942cbb1297e0cdbd5ff75c3fc7ed43770 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Wed, 19 Aug 2020 17:54:51 +0200 Subject: [PATCH] arm-trusted-firmware-mvebu: update to v2.3 Switch to release tarballs and add missing license information while here. Signed-off-by: Andre Heider --- .../boot/arm-trusted-firmware-mvebu/Makefile | 18 +++++++++-------- .../patches/200-hostssl.patch | 20 +++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index 068fe507e9..b97eb5877e 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arm-trusted-firmware-mvebu -PKG_VERSION:=2.2 -PKG_RELEASE:=2 +PKG_VERSION:=2.3 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE:=$(PKG_NAME)-$(PKG_RELEASE).tar.xz -PKG_SOURCE_URL:=https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git -PKG_SOURCE_DATE:=2020-01-21 -PKG_SOURCE_VERSION:=3b3d406ebc6f5dae6b5c9170c674183026e7301b -PKG_MIRROR_HASH:=7c63da237c52808e1fe49458d5a4ac804a8eb4c365e26c6b2b709256e8fc041f +PKG_SOURCE:=trusted-firmware-a-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot +PKG_HASH:=37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/trusted-firmware-a-$(PKG_VERSION) + +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=docs/license.rst PKG_MAINTAINER:=Vladimir Vid @@ -97,6 +98,7 @@ MAKE_VARS= \ CROSS_COMPILE="$(TARGET_CROSS)" MAKE_FLAGS = \ + OPENSSL_DIR=$(STAGING_DIR_HOST) \ CROSS_CM3=$(STAGING_DIR_IMAGE)/$(LINARO_NAME)-$(LINARO_RELEASE).$(LINARO_VERSION)/bin/arm-linux-gnueabi- \ BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \ MV_DDR_PATH=$(STAGING_DIR_IMAGE)/$(MV_DDR_NAME) \ diff --git a/package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch b/package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch new file mode 100644 index 0000000000..fc1a24a8ff --- /dev/null +++ b/package/boot/arm-trusted-firmware-mvebu/patches/200-hostssl.patch @@ -0,0 +1,20 @@ +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -19,7 +19,7 @@ ifeq (${DEBUG},1) + else + HOSTCCFLAGS += -O2 + endif +-LDLIBS := -lcrypto ++LDLIBS := -L${OPENSSL_DIR}/lib -lcrypto + + ifeq (${V},0) + Q := @ +@@ -27,7 +27,7 @@ else + Q := + endif + +-INCLUDE_PATHS := -I../../include/tools_share ++INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include + + HOSTCC ?= gcc + -- 2.30.2