From 87d2de88c155d7239145948d69953971ece45b6d Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Wed, 25 Jan 2023 22:02:53 +0100
Subject: [PATCH] pine64-rockpro64: use alpine's u-boot-rockchip (MR 3824)

Prepare to drop u-boot-rockpro64 in favor of using the u-boot package
from Alpine.

Related: https://wiki.pine64.org/wiki/RK3399_boot_sequence#U-Boot_boot_sequence
---
 device/community/device-pine64-rockpro64/APKBUILD   | 6 +++---
 device/community/device-pine64-rockpro64/deviceinfo | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/device/community/device-pine64-rockpro64/APKBUILD b/device/community/device-pine64-rockpro64/APKBUILD
index e15022e10..57a73b827 100644
--- a/device/community/device-pine64-rockpro64/APKBUILD
+++ b/device/community/device-pine64-rockpro64/APKBUILD
@@ -3,13 +3,13 @@
 # Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-rockpro64
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="PINE64 ROCKPro64"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip u-boot-rockpro64"
+depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip u-boot-rockchip"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"
@@ -29,5 +29,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-d99760ee331ceb0ec36a3fb7e7eea8ad0a28cd4098285f6217beeabf398d89e343c8f60ddc6482592b18ee58985ac8ce4feb16f69638b0a13d76eb150b519470  deviceinfo
+eda78fea2ccd53b2edb3895919ecaa6831c815509d2324bca8e23a6c901100215f4df5b63aa1a8e0a47a879af258c86cd84f661042088b67b5de566a49afc4a8  deviceinfo
 "
diff --git a/device/community/device-pine64-rockpro64/deviceinfo b/device/community/device-pine64-rockpro64/deviceinfo
index 5014c58c9..d65778996 100644
--- a/device/community/device-pine64-rockpro64/deviceinfo
+++ b/device/community/device-pine64-rockpro64/deviceinfo
@@ -19,7 +19,7 @@ deviceinfo_screen_height="1080"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware="u-boot/pine64-rockpro64/u-boot-rockchip.bin:32"
+deviceinfo_sd_embed_firmware="u-boot/rockpro64-rk3399/idbloader.img:32,u-boot/rockpro64-rk3399/u-boot.itb:8192"
 deviceinfo_boot_part_start="32768"
 deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_extlinux_config="true"