From 2d886ff8eb42b849fabe7c4eca0f97635a402beb Mon Sep 17 00:00:00 2001
From: Anton Bambura <jenneron@protonmail.com>
Date: Sat, 7 Jan 2023 01:57:09 +0200
Subject: [PATCH] pine64-rock64: use generated extlinux.conf (MR 3791)

---
 device/testing/device-pine64-rock64/APKBUILD      | 15 +++++----------
 device/testing/device-pine64-rock64/deviceinfo    |  3 +++
 device/testing/device-pine64-rock64/extlinux.conf |  9 ---------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 device/testing/device-pine64-rock64/extlinux.conf

diff --git a/device/testing/device-pine64-rock64/APKBUILD b/device/testing/device-pine64-rock64/APKBUILD
index 9aa843963..db9442de0 100644
--- a/device/testing/device-pine64-rock64/APKBUILD
+++ b/device/testing/device-pine64-rock64/APKBUILD
@@ -1,18 +1,16 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Timothy Valldeperas <tvall43@gmail.com>
 pkgname=device-pine64-rock64
-pkgver=2
-pkgrel=2
+pkgver=3
+pkgrel=0
 pkgdesc="PINE64 ROCK64"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-rockchip u-boot-rock64"
+depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip u-boot-rock64"
 makedepends="devicepkg-dev"
-source="deviceinfo
-	extlinux.conf
-	"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -20,11 +18,8 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/extlinux.conf \
-		"$pkgdir"/boot/extlinux/extlinux.conf
 }
 
 sha512sums="
-fafc12076d873c4c9b30e1d4eb7bdc5274d62423879f9cba6aba25432ec9bbeb7caed414e26df0658f13fc3c83399023ea5490c092e7032fa4f37315e0421d74  deviceinfo
-d2b5a96edd1158ad56f2cc1194fc1afccacc5b3bf2dcb25dc2c6713734e67ef83ed2f36d18e32f67db1ab9f543f7362b5eaa60cbe6bf0ddb77dd9b747485b079  extlinux.conf
+4963b3cdc4ab3503e3582133aa2a2d84c6c85af7f9a3f371b0150a3acb2217e8c620538f984b4af48792b09c738938de689f229bbdc9d87c26d8078ee18b9b0d  deviceinfo
 "
diff --git a/device/testing/device-pine64-rock64/deviceinfo b/device/testing/device-pine64-rock64/deviceinfo
index 5e3766af3..a744deee4 100644
--- a/device/testing/device-pine64-rock64/deviceinfo
+++ b/device/testing/device-pine64-rock64/deviceinfo
@@ -6,6 +6,7 @@ deviceinfo_name="PINE64 Rock64"
 deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-rock64"
 deviceinfo_year="2017"
+deviceinfo_dtb="rockchip/rk3328-rock64"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -20,3 +21,5 @@ deviceinfo_screen_height="1080"
 deviceinfo_flash_method="none"
 deviceinfo_sd_embed_firmware="u-boot/pine64-rock64/u-boot-rockchip.bin:32"
 deviceinfo_boot_part_start="32768"
+deviceinfo_kernel_cmdline="console=tty0 console=ttyS0,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"
diff --git a/device/testing/device-pine64-rock64/extlinux.conf b/device/testing/device-pine64-rock64/extlinux.conf
deleted file mode 100644
index 8ee2129df..000000000
--- a/device/testing/device-pine64-rock64/extlinux.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-timeout 10
-default POSTMARKETOS
-menu title boot prev kernel
-
-label POSTMARKETOS
-  kernel /vmlinuz
-  fdt /dtbs-postmarketos-rockchip/rockchip/rk3328-rock64.dtb
-  initrd /initramfs
-  append console=tty0 console=ttyS0,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT