From e6b4bd115fe369dc9c22ae2f1529f2b0331f4f0a Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 31 Dec 2019 09:09:33 +0000
Subject: [PATCH] rkbin: update to 4563e24

---
 packages/tools/rkbin/package.mk      |  6 +++---
 projects/Rockchip/bootloader/install | 22 ++++++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/tools/rkbin/package.mk b/packages/tools/rkbin/package.mk
index 49c478309a..e37a1cf1fb 100644
--- a/packages/tools/rkbin/package.mk
+++ b/packages/tools/rkbin/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rkbin"
-# Version is: Kwiboo/tag:libreelec-ba436b9
-PKG_VERSION="ba436b9d616318a9437895457f6bbef1cc873e2b"
-PKG_SHA256="72c2ef6ec1fe79da7c701056662343b9e1df1cf20e5df10bafc4ec0619ef4578"
+# Version is: Kwiboo/tag:libreelec-4563e24
+PKG_VERSION="4563e249a3f47e7fcd47a4c3769b6c05683b6e9d"
+PKG_SHA256="0b3479117700bce9afea2110c1f027b626c76d99045802218b35a53606547d60"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="https://github.com/rockchip-linux/rkbin"
diff --git a/projects/Rockchip/bootloader/install b/projects/Rockchip/bootloader/install
index 7de419692e..0f267ccfcb 100644
--- a/projects/Rockchip/bootloader/install
+++ b/projects/Rockchip/bootloader/install
@@ -14,20 +14,26 @@ case "$PKG_SOC" in
     PKG_LOADER="u-boot-dtb.bin"
     ;;
   rk3288)
-    PKG_DATAFILE="$PKG_RKBIN/rk32/rk3288_ddr_400MHz_v1.06.bin"
-    PKG_LOADER="$PKG_RKBIN/rk32/rk3288_miniloader_v2.36.bin"
+    PKG_DATAFILE="$PKG_RKBIN/rk32/rk3288_ddr_400MHz_v1.08.bin"
+    PKG_LOADER="$PKG_RKBIN/rk32/rk3288_miniloader_v2.58.bin"
     PKG_LOAD_ADDR="0x0"
     ;;
   rk3328)
-    PKG_DATAFILE="$PKG_RKBIN/rk33/rk3328_ddr_786MHz_v1.13.bin"
-    PKG_LOADER="$PKG_RKBIN/rk33/rk3328_miniloader_v2.49.bin"
-    PKG_BL31="$PKG_RKBIN/rk33/rk3328_bl31_v1.40.elf"
+    if [ "$UBOOT_SYSTEM" = "roc-cc" -o "$UBOOT_SYSTEM" = "box-trn9" ]; then
+      PKG_DATAFILE="$PKG_RKBIN/rk33/rk3328_ddr_933MHz_v1.16.bin"
+    else
+      PKG_DATAFILE="$PKG_RKBIN/rk33/rk3328_ddr_786MHz_v1.16.bin"
+    fi
+    PKG_LOADER="$PKG_RKBIN/rk33/rk3328_miniloader_v2.50.bin"
+    PKG_BL31="$PKG_RKBIN/rk33/rk3328_bl31_v1.42.elf"
+    PKG_BL31_ADDR="0x10000"
     PKG_LOAD_ADDR="0x200000"
     ;;
   rk3399)
     PKG_DATAFILE="$PKG_RKBIN/rk33/rk3399_ddr_800MHz_v1.17.bin"
-    PKG_LOADER="$PKG_RKBIN/rk33/rk3399_miniloader_v1.15.bin"
-    PKG_BL31="$PKG_RKBIN/rk33/rk3399_bl31_v1.24.elf"
+    PKG_LOADER="$PKG_RKBIN/rk33/rk3399_miniloader_v1.24.bin"
+    PKG_BL31="$PKG_RKBIN/rk33/rk3399_bl31_v1.31.elf"
+    PKG_BL31_ADDR="0x40000"
     PKG_LOAD_ADDR="0x200000"
     ;;
   *)
@@ -54,7 +60,7 @@ SEC=0
 [BL31_OPTION]
 SEC=1
 PATH=$PKG_BL31
-ADDR=0x00010000
+ADDR=$PKG_BL31_ADDR
 [BL32_OPTION]
 SEC=0
 [BL33_OPTION]