device/testing/device-pine64-a64lts/APKBUILD

@@ -2,13 +2,13 @@
 pkgname=device-pine64-a64lts
 pkgdesc="PINE64 A64-LTS"
 pkgver=0.5
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 u-boot-tools mesa-dri-gallium"
+depends="postmarketos-base linux-postmarketos-allwinner u-boot-sunxi u-boot-tools mesa-dri-gallium"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo

device/testing/device-pine64-dontbeevil/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-pine64-dontbeevil
 pkgdesc="PINE64 PinePhone Don't be evil devkit"
 pkgver=0.1
-pkgrel=23
+pkgrel=24
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ subpackages="
 	$pkgname-kernel-shortts:kernel_shortts
 	$pkgname-kernel-longts:kernel_longts
 "
-depends="postmarketos-base u-boot-pine64 u-boot-tools mesa-dri-gallium ofono"
+depends="postmarketos-base u-boot-sunxi u-boot-tools mesa-dri-gallium ofono"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 source="

temp/arm-trusted-firmware-crust/APKBUILD

+# 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
+"

temp/arm-trusted-firmware/APKBUILD

-# 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
 "

temp/u-boot-pinebookpro/APKBUILD

@@ -2,13 +2,13 @@
 # a driver for the display and supports efi loading operating systems
 pkgname=u-boot-pinebookpro
 pkgver=2020.07
-pkgrel=1
+pkgrel=2
 pkgdesc="u-boot bootloader for the rk3399"
 url="https://gitlab.denx.de/u-boot/u-boot"
 arch="aarch64"
 license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs
 	ISC LGPL-2.0-only LGPL-2.1-only X11"
-makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware-rk3399 u-boot-tools"
+makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware u-boot-tools"
 options="!check"
 source="
 	ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2
@@ -30,7 +30,7 @@ build() {
 	LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h
 	LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h
 
-	export BL31="/usr/share/arm-trusted-firmware-rk3399/bl31.elf"
+	export BL31="/usr/share/arm-trusted-firmware/rk3399/bl31.elf"
 	export BUILD_DIR="$builddir"/build
 	mkdir -p "$BUILD_DIR"
 	make O="$BUILD_DIR" HOSTCC=gcc ARCH=arm LOGO_BMP=$srcdir/pine64.bmp pinebook-pro-rk3399_defconfig

temp/u-boot-pinephone/APKBUILD

 # U-boot with patches to make the PinePhone boot faster and have control over the ddr clock speed
 pkgname=u-boot-pinephone
 pkgver=2021.01_git20201228
-pkgrel=3
+pkgrel=4
 # Last commit from "crust" branch, as used in "crust-meta":
 # https://gitlab.com/pine64-org/crust-meta/-/blob/8886bcc829179bf77216fade71f0ede9bd014e67/Makefile#L78
 _commit="7492749fec31b1086bc8933bf113a766aea021aa"
@@ -11,7 +11,7 @@ arch="aarch64"
 license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs
 	ISC LGPL-2.0-only LGPL-2.1-only X11"
 depends="linux-postmarketos-allwinner>=5.12"
-makedepends="$depends_dev bc dtc python3-dev py3-setuptools swig bison flex openssl-dev arm-trusted-firmware-sun50i crust"
+makedepends="$depends_dev bc dtc python3-dev py3-setuptools swig bison flex openssl-dev arm-trusted-firmware-crust crust"
 options="!check"
 source="https://gitlab.com/pine64-org/u-boot/-/archive/$_commit/u-boot-$_commit.tar.gz
 	0001-expose-DRAM-clock-speed.patch
@@ -26,7 +26,7 @@ build() {
 	LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h
 	LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h
 
-	export BL31="/usr/share/arm-trusted-firmware-sun50i/bl31.bin"
+	export BL31="/usr/share/crust/arm-trusted-firmware/sun50i_a64/bl31.bin"
 	export SCP="/usr/share/crust/pinephone/scp.bin"
 	export BUILD_DIR="$builddir"/build
 	

temp/u-boot-rockpro64/APKBUILD

@@ -2,13 +2,13 @@
 
 pkgname=u-boot-rockpro64
 pkgver=2020.04
-pkgrel=2
+pkgrel=3
 pkgdesc="u-boot bootloader for the rk3399"
 url="https://gitlab.com/pine64-org/u-boot"
 arch="aarch64"
 license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs
 	ISC LGPL-2.0-only LGPL-2.1-only X11"
-makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware-rk3399"
+makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware"
 options="!check"
 source="
 	ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2
@@ -22,7 +22,7 @@ build() {
 	LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h
 	LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h
 
-	export BL31="/usr/share/arm-trusted-firmware-rk3399/bl31.elf"
+	export BL31="/usr/share/arm-trusted-firmware/rk3399/bl31.elf"
 	export BUILD_DIR="$builddir"/build
 	mkdir -p "$BUILD_DIR"
 	make O="$BUILD_DIR" HOSTCC=gcc ARCH=arm rockpro64-rk3399_defconfig