use ARM-trusted-firmware mainline

uboot-rock64/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=uboot-rock64
 pkgver=2020.04
-pkgrel=2
+pkgrel=3
 pkgdesc="U-Boot for Rock64"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
@@ -13,19 +13,21 @@ makedepends=('bc' 'git' 'python' 'swig' 'dtc')
 install=${pkgname}.install
 _commit_rkbin=15a3e065a49ba7981945d725207618e92ebe8ebb
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}-rc5.tar.bz2"
-        "git+https://github.com/rockchip-linux/rkbin.git#commit=$_commit_rkbin"
+        "https://github.com/ARM-software/arm-trusted-firmware/archive/v2.3-rc0.tar.gz"
         'boot.txt'
         'mkscr')
 md5sums=('86f167cfe3a840ac47ddba868d6f1576'
-         'SKIP'
+         'd1a2ae6b8b7a86a661db4079dd08b941'
          'a4f9a9f05a4e41f54b60a51318ffca36'
          '021623a04afd29ac3f368977140cfbfd')
 
 prepare() {
+  cd ${srcdir}/arm-trusted-firmware-2.3-rc0
+  make PLAT=rk3328 all
+
   mv ${srcdir}/u-boot-${pkgver}{-rc5,}
   cd ${srcdir}/u-boot-${pkgver/rc/-rc}
-  cp ../rkbin/bin/rk33/rk322xh_bl31_v1.43.elf ./bl31.elf
-  cp ../rkbin/bin/rk33/rk322xh_bl32_v1.54.bin ./bl32.bin
+  cp ../arm-trusted-firmware-2.3-rc0/build/rk3328/release/bl31/bl31.elf ./bl31.elf
 
 #  sed -i 's/lpddr3-1600/lpddr3-666/g' arch/arm/dts/rk3328-rock64-u-boot.dtsi
   sed -i 's/800/600/g' arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
@@ -46,9 +48,9 @@ build() {
   unset CLFAGS CXXFLAGS CPPFLAGS LDFLAGS
 
 #  make distclean
-  make BL31=bl31.elf BL32=bl32.bin rock64-rk3328_defconfig
-  make BL31=bl31.elf BL32=bl32.bin -j4 EXTRAVERSION=-${pkgrel}
-  make BL31=bl31.elf BL32=bl32.bin -j4 EXTRAVERSION=-${pkgrel} u-boot.itb
+  make rock64-rk3328_defconfig
+  make -j4 EXTRAVERSION=-${pkgrel}
+  make -j4 EXTRAVERSION=-${pkgrel} u-boot.itb
 }
 
 package() {

uboot-rock64/rk3328trust.ini

@@ -1,17 +0,0 @@
-[VERSION]
-MAJOR=1
-MINOR=2
-[BL30_OPTION]
-SEC=0
-[BL31_OPTION]
-SEC=1
-PATH=../rkbin/bin/rk33/rk322xh_bl31_v1.43.elf
-ADDR=0x40000
-[BL32_OPTION]
-SEC=1
-PATH=../rkbin/bin/rk33/rk322xh_bl32_v1.54.bin
-ADDR=0x08400000
-[BL33_OPTION]
-SEC=0
-[OUTPUT]
-PATH=trust.img