From df6c69101bb6958352cbf89d3932a8812a48219b Mon Sep 17 00:00:00 2001
From: exkc <exkc@exkc.moe>
Date: Fri, 13 Jan 2023 18:12:34 +0800
Subject: [PATCH] mangopi-mq-pro: remove unnecessary uboot-script.cmd (MR 3803)

by moving grub's efi file to correct path
---
 device/testing/device-mangopi-mq-pro/APKBUILD | 14 +++-----------
 .../device-mangopi-mq-pro/uboot-script.cmd    | 19 -------------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 device/testing/device-mangopi-mq-pro/uboot-script.cmd

diff --git a/device/testing/device-mangopi-mq-pro/APKBUILD b/device/testing/device-mangopi-mq-pro/APKBUILD
index 0b9fa933c..18193990e 100644
--- a/device/testing/device-mangopi-mq-pro/APKBUILD
+++ b/device/testing/device-mangopi-mq-pro/APKBUILD
@@ -23,7 +23,6 @@ source="
 	deviceinfo
 	grub_early.cfg
 	grub.cfg
-	uboot-script.cmd
 	"
 
 build() {
@@ -32,7 +31,7 @@ build() {
 	grub-mkimage \
 		--config="$srcdir/grub_early.cfg" \
 		--prefix="" \
-		--output="BOOTRISCV64.EFI" \
+		--output="bootriscv64.efi" \
 		--format="riscv64-efi" \
 		--compression="xz" \
 		\
@@ -56,21 +55,15 @@ build() {
 		search_label \
 		test \
 		true
-	mkimage -A riscv -O linux -T script -C none -a 0 -e 0  \
-		-n postmarketos -d "$srcdir"/uboot-script.cmd \
-		"$srcdir"/boot.scr
 }
 
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -Dm644 "$srcdir"/BOOTRISCV64.EFI \
-		"$pkgdir"/boot/EFI/BOOT/BOOTRISCV64.EFI
+	install -Dm644 "$srcdir"/bootriscv64.efi \
+		"$pkgdir"/boot/efi/boot/bootriscv64.efi
 	install -D "$srcdir"/grub.cfg \
 		"$pkgdir"/boot/grub/grub.cfg
-	install -D -m644 "$srcdir"/boot.scr \
-		"$pkgdir"/boot/boot.scr
-
 	}
 
 
@@ -80,5 +73,4 @@ sha512sums="
 52f6ecb04e16cdef4d220f5402304e4df3ab8c448c84162a35822d6205802b9cd0571c4fa0ccfd62c44d4d9af8254a18c418249bd3a76ae42a05874d739f0c16  deviceinfo
 95cbead11ff1c299e8f47af5a8b36c6e55ec8b41eb5dee54c9db28d707b42ffac94a81115edb960f844aa8fce417ec23a82d39e334090698e0fc45a3d880b471  grub_early.cfg
 611908cde1084216ac5013b86019edc91cdae42c3557fd87e244df1815150a2b0a95e24951ee1cc43fc47771a136cf1c1afa95d9daf7ee17d3158a50bd2d1c0d  grub.cfg
-54824f653c983be53afdbc7f024245562c7ca52413b0eeb1bbec74b70d8edc453a52437da9eeb331625bcc51f7a80928e40fca7de927f09879dc13fcb07e54ad  uboot-script.cmd
 "
diff --git a/device/testing/device-mangopi-mq-pro/uboot-script.cmd b/device/testing/device-mangopi-mq-pro/uboot-script.cmd
deleted file mode 100644
index 64bb86523..000000000
--- a/device/testing/device-mangopi-mq-pro/uboot-script.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-
-setenv bootdev 0
-
-printenv
-
-echo Loading DTB
-load mmc ${mmc_bootdev}:1 ${fdt_addr_r} /sun20i-d1-mangopi-mq-pro.dtb
-
-echo Loading Grub
-load mmc ${mmc_bootdev}:1 ${kernel_addr_r} /EFI/BOOT/BOOTRISCV64.EFI
-
-echo Resizing FDT
-fdt addr ${fdt_addr_r}
-fdt resize
-
-
-echo Booting Grub
-bootefi ${kernel_addr_r} ${fdt_addr_r}
-