From eed1339b3f81c3c048c805856579cdeb1cb71c6d Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Sat, 15 Aug 2020 11:17:48 +0200
Subject: [PATCH] update to uboot-2020.07 and stable ATF-2.3

Signed-off-by: Kabbone <tobias@opel-online.de>
---
 uboot-rock64/PKGBUILD | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/uboot-rock64/PKGBUILD b/uboot-rock64/PKGBUILD
index 06dc42b..7564b83 100644
--- a/uboot-rock64/PKGBUILD
+++ b/uboot-rock64/PKGBUILD
@@ -2,48 +2,43 @@
 # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
 
 pkgname=uboot-rock64
-pkgver=2020.04
-pkgrel=3
+pkgver=2020.07
+pkgrel=1
 pkgdesc="U-Boot for Rock64"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
 license=('GPL')
 backup=('boot/boot.txt' 'boot/boot.scr')
-makedepends=('bc' 'git' 'python' 'swig' 'dtc')
+makedepends=('bc' 'git' 'python' 'swig' 'dtc' 'uboot-tools')
 install=${pkgname}.install
-_commit_rkbin=15a3e065a49ba7981945d725207618e92ebe8ebb
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}-rc5.tar.bz2"
-        "https://github.com/ARM-software/arm-trusted-firmware/archive/v2.3-rc0.tar.gz"
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+        "https://github.com/ARM-software/arm-trusted-firmware/archive/v2.3.tar.gz"
         'boot.txt'
         'mkscr')
-md5sums=('86f167cfe3a840ac47ddba868d6f1576'
-         'd1a2ae6b8b7a86a661db4079dd08b941'
+md5sums=('86e51eeccd15e658ad1df943a0edf622'
+         '06ad72bdf63b922a3f3865d81f5d9ad2'
          'a4f9a9f05a4e41f54b60a51318ffca36'
          '021623a04afd29ac3f368977140cfbfd')
 
 prepare() {
-  cd ${srcdir}/arm-trusted-firmware-2.3-rc0
+  cd ${srcdir}/arm-trusted-firmware-2.3
   make PLAT=rk3328 all
 
-  mv ${srcdir}/u-boot-${pkgver}{-rc5,}
-  cd ${srcdir}/u-boot-${pkgver/rc/-rc}
-  cp ../arm-trusted-firmware-2.3-rc0/build/rk3328/release/bl31/bl31.elf ./bl31.elf
+  cd ${srcdir}/u-boot-${pkgver}
+  cp ../arm-trusted-firmware-2.3/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
 
-  cd ${srcdir}/u-boot-${pkgver/rc/-rc}/configs
-  echo 'CONFIG_CMD_BTRFS=y' >> rock64-rk3328_defconfig
-  echo 'CONFIG_FS_BTRFS=y' >> rock64-rk3328_defconfig
+  cd ${srcdir}/u-boot-${pkgver}/configs
+#  echo 'CONFIG_CMD_BTRFS=y' >> rock64-rk3328_defconfig
+#  echo 'CONFIG_FS_BTRFS=y' >> rock64-rk3328_defconfig
 #  echo 'CONFIG_NETCONSOLE=y' >> rock64-rk3328_defconfig
   echo 'CONFIG_IDENT_STRING=" Arch Linux ARM"' >> rock64-rk3328_defconfig
 
-#  cd ${srcdir}/u-boot-${pkgver/rc/-rc}/fs/btrfs
-#  patch --forward --strip=3 --input="${srcdir}/btrfs_extentio.patch"
 }
 
 build() {
-  cd ${srcdir}/u-boot-${pkgver/rc/-rc}
+  cd ${srcdir}/u-boot-${pkgver}
 
   unset CLFAGS CXXFLAGS CPPFLAGS LDFLAGS
 
@@ -54,7 +49,7 @@ build() {
 }
 
 package() {
-  cd u-boot-${pkgver/rc/-rc}
+  cd u-boot-${pkgver}
 
   mkdir -p "${pkgdir}/boot"