From c55ddae1adbced7b7947b62cf90a9c407c65b5af Mon Sep 17 00:00:00 2001
From: exkc <exkc@exkc.moe>
Date: Fri, 13 Jan 2023 18:23:05 +0800
Subject: [PATCH] mangopi-mq-pro: use generated grub.cfg (MR 3803)

---
 device/testing/device-mangopi-mq-pro/APKBUILD | 25 +++++--------------
 .../testing/device-mangopi-mq-pro/deviceinfo  |  4 +--
 device/testing/device-mangopi-mq-pro/grub.cfg |  9 -------
 .../device-mangopi-mq-pro/grub_early.cfg      |  4 ---
 4 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 device/testing/device-mangopi-mq-pro/grub.cfg
 delete mode 100644 device/testing/device-mangopi-mq-pro/grub_early.cfg

diff --git a/device/testing/device-mangopi-mq-pro/APKBUILD b/device/testing/device-mangopi-mq-pro/APKBUILD
index 18193990e..a5b8daa35 100644
--- a/device/testing/device-mangopi-mq-pro/APKBUILD
+++ b/device/testing/device-mangopi-mq-pro/APKBUILD
@@ -1,8 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-mangopi-mq-pro
 pkgdesc="MangoPi MQ-Pro"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="riscv64"
@@ -11,7 +12,6 @@ options="!check !archcheck pmb:strict"
 depends="
 	linux-postmarketos-allwinner-d1
 	postmarketos-base
-	u-boot-tools
 	u-boot-mangopi-mq-pro
 "
 makedepends="
@@ -19,18 +19,13 @@ makedepends="
 	grub
 	grub-efi
 	"
-source="
-	deviceinfo
-	grub_early.cfg
-	grub.cfg
-	"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
 
 	grub-mkimage \
-		--config="$srcdir/grub_early.cfg" \
-		--prefix="" \
+		--prefix="/grub" \
 		--output="bootriscv64.efi" \
 		--format="riscv64-efi" \
 		--compression="xz" \
@@ -59,18 +54,10 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
 	install -Dm644 "$srcdir"/bootriscv64.efi \
 		"$pkgdir"/boot/efi/boot/bootriscv64.efi
-	install -D "$srcdir"/grub.cfg \
-		"$pkgdir"/boot/grub/grub.cfg
 	}
 
-
-
-
 sha512sums="
-52f6ecb04e16cdef4d220f5402304e4df3ab8c448c84162a35822d6205802b9cd0571c4fa0ccfd62c44d4d9af8254a18c418249bd3a76ae42a05874d739f0c16  deviceinfo
-95cbead11ff1c299e8f47af5a8b36c6e55ec8b41eb5dee54c9db28d707b42ffac94a81115edb960f844aa8fce417ec23a82d39e334090698e0fc45a3d880b471  grub_early.cfg
-611908cde1084216ac5013b86019edc91cdae42c3557fd87e244df1815150a2b0a95e24951ee1cc43fc47771a136cf1c1afa95d9daf7ee17d3158a50bd2d1c0d  grub.cfg
+4d09851f4d9d43662c8a4276c0bbca5e5e68c25f7efee17db04b3262bb0b89b76e3545405aa6642faa4f90246a2f774556658903a3a8418497c69ba952ab2d90  deviceinfo
 "
diff --git a/device/testing/device-mangopi-mq-pro/deviceinfo b/device/testing/device-mangopi-mq-pro/deviceinfo
index 15cd2f1b3..54ad10195 100644
--- a/device/testing/device-mangopi-mq-pro/deviceinfo
+++ b/device/testing/device-mangopi-mq-pro/deviceinfo
@@ -23,5 +23,5 @@ deviceinfo_getty="ttyS0;115200"
 deviceinfo_flash_method="none"
 deviceinfo_sd_embed_firmware="u-boot/mangopi_mq_pro/u-boot-sunxi-with-spl.bin:8"
 deviceinfo_boot_part_start="8192"
-
-
+deviceinfo_kernel_cmdline="rw console=tty0 console=ttyS0,115200 no_console_suspend panic=10 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_generate_grub_config="true"
diff --git a/device/testing/device-mangopi-mq-pro/grub.cfg b/device/testing/device-mangopi-mq-pro/grub.cfg
deleted file mode 100644
index 12076a640..000000000
--- a/device/testing/device-mangopi-mq-pro/grub.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-timeout=0
-
-menuentry "postmarketOS" {
-	linux ($root)/vmlinuz init=/init.sh rw console=tty0 console=ttyS0,115200  pmos_boot=/dev/mmcblk0p1 pmos_root=/dev/mmcblk0p2 
-	initrd ($root)/initramfs
-	devicetree ($root)/sun20i-d1-mangopi-mq-pro.dtb 
-}
-
-
diff --git a/device/testing/device-mangopi-mq-pro/grub_early.cfg b/device/testing/device-mangopi-mq-pro/grub_early.cfg
deleted file mode 100644
index 964e7f0c7..000000000
--- a/device/testing/device-mangopi-mq-pro/grub_early.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-search --no-floppy --set=root --label "pmOS_boot"
-set prefix=($root)/grub
-
-