From 1a7b24b452a4a910cf39a28c0cdecabde76ee78d Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Fri, 9 Jul 2021 21:31:41 +0200
Subject: [PATCH] temp/u-boot-rockpro64: upgrade to 2021.07 (MR 2299)

The new version is needed to run compressed kernels
---
 ...-led.patch => 0000-rk3399-power-led.patch} |  0
 .../u-boot-rockpro64/0001-fix-boot-hang.patch | 24 +++++++++++++++++++
 temp/u-boot-rockpro64/APKBUILD                | 16 ++++++++-----
 3 files changed, 34 insertions(+), 6 deletions(-)
 rename temp/u-boot-rockpro64/{rk3399-power-led.patch => 0000-rk3399-power-led.patch} (100%)
 create mode 100644 temp/u-boot-rockpro64/0001-fix-boot-hang.patch

diff --git a/temp/u-boot-rockpro64/rk3399-power-led.patch b/temp/u-boot-rockpro64/0000-rk3399-power-led.patch
similarity index 100%
rename from temp/u-boot-rockpro64/rk3399-power-led.patch
rename to temp/u-boot-rockpro64/0000-rk3399-power-led.patch
diff --git a/temp/u-boot-rockpro64/0001-fix-boot-hang.patch b/temp/u-boot-rockpro64/0001-fix-boot-hang.patch
new file mode 100644
index 000000000..b10714556
--- /dev/null
+++ b/temp/u-boot-rockpro64/0001-fix-boot-hang.patch
@@ -0,0 +1,24 @@
+The new u-boot releases bring up HDMI and USB and it causes the kernel or u-boot to hang
+on most boot tries. USE_PREBOOT is disabled so USB won't be brought up which causes an hang
+after 2020.10 and HDMI being on confuses Linux enough to break everything. 
+diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
+index ae11a8f5eb..aa8f55639c 100644
+--- a/configs/rockpro64-rk3399_defconfig
++++ b/configs/rockpro64-rk3399_defconfig
+@@ -12,7 +12,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000
+ CONFIG_SPL_SPI_FLASH_SUPPORT=y
+ CONFIG_SPL_SPI_SUPPORT=y
+ CONFIG_DEBUG_UART=y
+-CONFIG_USE_PREBOOT=y
++CONFIG_USE_PREBOOT=n
+ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb"
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+ CONFIG_MISC_INIT_R=y
+@@ -81,6 +81,6 @@ CONFIG_USB_ETHER_SMSC95XX=y
+ CONFIG_DM_VIDEO=y
+ CONFIG_DISPLAY=y
+ CONFIG_VIDEO_ROCKCHIP=y
+-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
++CONFIG_DISPLAY_ROCKCHIP_HDMI=n
+ CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_ERRNO_STR=y
diff --git a/temp/u-boot-rockpro64/APKBUILD b/temp/u-boot-rockpro64/APKBUILD
index 7e34fb4cc..f4627c5ea 100644
--- a/temp/u-boot-rockpro64/APKBUILD
+++ b/temp/u-boot-rockpro64/APKBUILD
@@ -1,8 +1,8 @@
 # U-boot RC built for rk3399, can be upstreamed to alpine soon when 2020.04 is released
 
 pkgname=u-boot-rockpro64
-pkgver=2020.04
-pkgrel=3
+pkgver=2021.07
+pkgrel=0
 pkgdesc="u-boot bootloader for the rk3399"
 url="https://gitlab.com/pine64-org/u-boot"
 arch="aarch64"
@@ -12,7 +12,8 @@ makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-tru
 options="!check"
 source="
 	ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2
-	rk3399-power-led.patch
+	0000-rk3399-power-led.patch
+	0001-fix-boot-hang.patch
 	update-u-boot
 	"
 builddir="$srcdir"/u-boot-${pkgver//_/-}
@@ -36,6 +37,9 @@ package() {
 }
 
 
-sha512sums="e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8  u-boot-2020.04.tar.bz2
-4495dbaceac1cc42b3506dda81e0920f8eca19e11e0d717637dba6e4623e95cd4c3c94e7fc3aa8f3cbfe5fcaf0c0c109d1699eb7f278a69fa8e209c7cd6e4c02  rk3399-power-led.patch
-8bd5e4236257f3a971f207ff3ae8f97358e6ec4a110fa14e675bf583e1f1ccacbc1e8d2c887ac66eb64369cd0d6c3beab7643d201592bb0ec1c66c8f27a58fc8  update-u-boot"
+sha512sums="
+210b206a4626feb0985580d9448a97b499b09bf9b9313ca847a66624785e9e9b0fae8f2e329acd344f5f75cb722d2093dd0ee394311ddd1fde05e400ee71a24d  u-boot-2021.07.tar.bz2
+4495dbaceac1cc42b3506dda81e0920f8eca19e11e0d717637dba6e4623e95cd4c3c94e7fc3aa8f3cbfe5fcaf0c0c109d1699eb7f278a69fa8e209c7cd6e4c02  0000-rk3399-power-led.patch
+7772b0a2a811b422dab491b6a97d82f6153c49288f92bcf0194c26303810ffb0242a479afcffc079d1262f4cc118726198764b5135b4aad4b69a95346eeef6e9  0001-fix-boot-hang.patch
+8bd5e4236257f3a971f207ff3ae8f97358e6ec4a110fa14e675bf583e1f1ccacbc1e8d2c887ac66eb64369cd0d6c3beab7643d201592bb0ec1c66c8f27a58fc8  update-u-boot
+"