From f9a19babd662015aec6ffaff55936e80b1daeea9 Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Tue, 7 Apr 2020 19:55:28 +0200
Subject: [PATCH] temp/arm-trusted-firmware: new aport (MR 882)

---
 temp/arm-trusted-firmware/APKBUILD            | 41 +++++++++++++++++++
 .../rk3399-baudrate.patch                     | 23 +++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 temp/arm-trusted-firmware/APKBUILD
 create mode 100644 temp/arm-trusted-firmware/rk3399-baudrate.patch

diff --git a/temp/arm-trusted-firmware/APKBUILD b/temp/arm-trusted-firmware/APKBUILD
new file mode 100644
index 000000000..a643c5e67
--- /dev/null
+++ b/temp/arm-trusted-firmware/APKBUILD
@@ -0,0 +1,41 @@
+# Forked for adding rk3399 support
+pkgname=arm-trusted-firmware
+_pkgver=2.2
+pkgver=9999
+pkgrel=0
+pkgdesc="ARM Trusted Firmware-A (TF-A)"
+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/ARM-software/$pkgname/archive/v$_pkgver.tar.gz
+	rk3399-baudrate.patch
+"
+builddir="$srcdir/$pkgname-$_pkgver"
+
+build() {
+	LDFLAGS="" make PLAT=sun50i_a64 bl31
+	LDFLAGS="" make PLAT=rk3399 bl31
+}
+
+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/
+}
+
+sha512sums="7bdeb1044612a9fd0d61097f7cc9b27830d992a41a06359bb6653dab15296abf3d8b4dc63fc1988ede709d7c011afcfb304ff2818f80b91c1fc471be2a3c72be  arm-trusted-firmware-2.2.tar.gz
+86d8c60157145ab05e9b870aad11d2acaf2137ba00bf71419f8a54a4fd2b1906c19bc8bfeccc735344d1dcf11ba81bd9396bfd8854cdb972a72503b632d1e900  rk3399-baudrate.patch"
diff --git a/temp/arm-trusted-firmware/rk3399-baudrate.patch b/temp/arm-trusted-firmware/rk3399-baudrate.patch
new file mode 100644
index 000000000..8b133d549
--- /dev/null
+++ b/temp/arm-trusted-firmware/rk3399-baudrate.patch
@@ -0,0 +1,23 @@
+From b3fc3a853b8357afd3a010a765072d27f640f5e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Sat, 14 Sep 2019 11:09:01 +0100
+Subject: [PATCH] Increase BAUD_RATE to 1500000, so that it matches U-Boot and
+ kernel.
+
+---
+ plat/rockchip/rk3399/rk3399_def.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h
+index ba83242e..8d6ecfbe 100644
+--- a/plat/rockchip/rk3399/rk3399_def.h
++++ b/plat/rockchip/rk3399/rk3399_def.h
+@@ -17,7 +17,7 @@
+ /**************************************************************************
+  * UART related constants
+  **************************************************************************/
+-#define RK3399_BAUDRATE			115200
++#define RK3399_BAUDRATE			1500000
+ #define RK3399_UART_CLOCK		24000000
+ 
+ /******************************************************************************