From 0cc558257494f8ba1a9ce64e5ef4adcd1ed336c1 Mon Sep 17 00:00:00 2001
From: Maxim Karasev <begs@disroot.org>
Date: Fri, 25 Jun 2021 20:53:00 +0300
Subject: [PATCH] temp/arm-trusted-firmware{,-crust}: sync with upstream, split
 crust-specific package (MR 2270)

---
 temp/arm-trusted-firmware-crust/APKBUILD | 35 +++++++++++++++
 temp/arm-trusted-firmware/APKBUILD       | 54 ++++++++++++------------
 2 files changed, 62 insertions(+), 27 deletions(-)
 create mode 100644 temp/arm-trusted-firmware-crust/APKBUILD

diff --git a/temp/arm-trusted-firmware-crust/APKBUILD b/temp/arm-trusted-firmware-crust/APKBUILD
new file mode 100644
index 000000000..365892db7
--- /dev/null
+++ b/temp/arm-trusted-firmware-crust/APKBUILD
@@ -0,0 +1,35 @@
+# Forked for adding crust compatibility
+pkgname=arm-trusted-firmware-crust
+_pkgver=crust-20210410
+pkgver=20210410
+pkgrel=0
+pkgdesc="ARM Trusted Firmware-A (TF-A) with Crust compatibility"
+url="https://github.com/crust-firmware/arm-trusted-firmware/"
+arch="aarch64"
+license="BSD-3-Clause"
+makedepends="dtc openssl-dev gcc-arm-none-eabi"
+source="
+	$pkgname-$pkgver.tar.gz::https://github.com/crust-firmware/arm-trusted-firmware/archive/refs/tags/$_pkgver.tar.gz
+"
+options="!check" # No tests
+builddir="$srcdir/$pkgname-$pkgver"
+
+_plats="sun50i_a64 sun50i_h6"
+
+build() {
+	unset LDFLAGS
+	for plat in $_plats; do
+		make PLAT=$plat bl31
+	done
+}
+
+package() {
+	for plat in $_plats; do
+		install -D "$builddir"/build/$plat/release/bl31.bin \
+			"$pkgdir"/usr/share/crust/arm-trusted-firmware/$plat/bl31.bin
+	done
+}
+
+sha512sums="
+ecc69c60d35d5c116647c13067e425b75f46ce5753d0e518396a55dfa6e934ff16ccbc91349bcb6dbd55011e289afc8448e2b3da082e05a0fc757563e4605948  arm-trusted-firmware-crust-20210410.tar.gz
+"
diff --git a/temp/arm-trusted-firmware/APKBUILD b/temp/arm-trusted-firmware/APKBUILD
index 9c7927d5a..872bf05d4 100644
--- a/temp/arm-trusted-firmware/APKBUILD
+++ b/temp/arm-trusted-firmware/APKBUILD
@@ -1,44 +1,44 @@
-# Forked for adding rk3399 support and crust compatibility
+# Forked for adding rk3399 support
 pkgname=arm-trusted-firmware
-_pkgver=crust-20210410
 pkgver=9999
-pkgrel=2
+_pkgver=2.5
+pkgrel=3
 pkgdesc="ARM Trusted Firmware-A (TF-A)"
-url="https://github.com/crust-firmware/arm-trusted-firmware/"
+url="https://github.com/ARM-software/arm-trusted-firmware"
 arch="aarch64"
 license="BSD-3-Clause"
 makedepends="dtc openssl-dev gcc-arm-none-eabi"
-options="!check" # no tests
-subpackages="$pkgname-sun50i $pkgname-rk3399"
-source="
-	$pkgname-$_pkgver.tar.gz::https://github.com/crust-firmware/arm-trusted-firmware/archive/refs/tags/$_pkgver.tar.gz
-	rk3399-baudrate.patch
-"
-options="!check" # no testsuite
+options="!check" # No tests
 builddir="$srcdir/$pkgname-$_pkgver"
+source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$_pkgver/arm-trusted-firmware-v$_pkgver.tar.gz
+	rk3399-baudrate.patch"
+options="!check" # No tests
+
+_plats="sun50i_a64 sun50i_h6 rk3399"
 
 build() {
-	LDFLAGS="" make PLAT=sun50i_a64 bl31
-	LDFLAGS="" make PLAT=rk3399 bl31
+	unset LDFLAGS
+	for plat in $_plats; do
+		make PLAT=$plat bl31
+	done
 }
 
 package() {
-	mkdir -p "$pkgdir"/usr/share/$pkgname
-}
-
-sun50i() {
-	pkgdesc="ARM Trusted Firmware-A for sun50i"
-	mkdir -p "$subpkgdir"/usr/share/$subpkgname
-	install "$builddir"/build/sun50i_a64/release/bl31.bin "$subpkgdir"/usr/share/$subpkgname/
-}
-
-rk3399() {
-	pkgdesc="ARM Trusted Firmware-A for rk3399"
-	mkdir -p "$subpkgdir"/usr/share/$subpkgname
-	install "$builddir"/build/rk3399/release/bl31/bl31.elf "$subpkgdir"/usr/share/$subpkgname/
+	for plat in $_plats; do
+		case $plat in
+			rk3399)
+				install -D "$builddir"/build/$plat/release/bl31/bl31.elf \
+					"$pkgdir"/usr/share/$pkgname/$plat/bl31.elf
+					;;
+			*)
+				install -D "$builddir"/build/$plat/release/bl31.bin \
+					"$pkgdir"/usr/share/$pkgname/$plat/bl31.bin
+					;;
+		esac
+	done
 }
 
 sha512sums="
-ecc69c60d35d5c116647c13067e425b75f46ce5753d0e518396a55dfa6e934ff16ccbc91349bcb6dbd55011e289afc8448e2b3da082e05a0fc757563e4605948  arm-trusted-firmware-crust-20210410.tar.gz
+3c99f1d849c3c536e8e2e4838ee48a1a431f0bef35eaf27eb14f9caebde71a577589b10efbbd7db49bed3b9763bed46583d0b26e72f61fcd0d34cc46ff684846  arm-trusted-firmware-v2.5.tar.gz
 86d8c60157145ab05e9b870aad11d2acaf2137ba00bf71419f8a54a4fd2b1906c19bc8bfeccc735344d1dcf11ba81bd9396bfd8854cdb972a72503b632d1e900  rk3399-baudrate.patch
 "