From 5ae8060f6d85826410d363b09cca318c6c663230 Mon Sep 17 00:00:00 2001
From: Anton Bambura <jenneron@protonmail.com>
Date: Thu, 11 May 2023 12:36:21 +0300
Subject: [PATCH] google-nyan-big: switch from u-boot script to extlinux (MR
 4074)

---
 .../testing/device-google-nyan-big/APKBUILD   | 21 ++-----------
 .../testing/device-google-nyan-big/deviceinfo |  1 +
 .../device-google-nyan-big/uboot-script.cmd   | 30 -------------------
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 device/testing/device-google-nyan-big/uboot-script.cmd

diff --git a/device/testing/device-google-nyan-big/APKBUILD b/device/testing/device-google-nyan-big/APKBUILD
index de9319ec1..98f454516 100644
--- a/device/testing/device-google-nyan-big/APKBUILD
+++ b/device/testing/device-google-nyan-big/APKBUILD
@@ -23,7 +23,7 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-sway
 "
-makedepends="devicepkg-dev u-boot-tools"
+makedepends="devicepkg-dev"
 source="
 	30-xusb-firmware.files
 	deviceinfo
@@ -31,22 +31,10 @@ source="
 	mpv/mpv.conf.wayland
 	mpv/mpv.conf.xorg
 	sway/tinydm/10-no-hardware-cursor.sh
-	uboot-script.cmd
 "
 
 build() {
 	devicepkg_build $startdir $pkgname
-
-	mkimage \
-		-A arm \
-		-O linux \
-		-T script \
-		-C none \
-		-a 0 \
-		-e 0 \
-		-n postmarketos \
-		-d "$srcdir"/uboot-script.cmd \
-		"$srcdir"/boot.scr
 }
 
 package() {
@@ -55,10 +43,6 @@ package() {
 	# Block nouveau as it is in very bad condition
 	install -Dm644 "$srcdir"/gpu.conf \
 		"$pkgdir"/etc/modprobe.d/gpu.conf
-
-	# U-Boot script
-	install -Dm644 "$srcdir"/boot.scr \
-		"$pkgdir"/boot/boot.scr
 }
 
 kernel_nyan_big() {
@@ -120,10 +104,9 @@ sway() {
 
 sha512sums="
 793688374d77efaf050c187d296d7fd55243773a1257b4d8adfa4cda50d4c0cacc035fb3d419a4b608989ed920636048680d900afe8a712f2166edf51552087a  30-xusb-firmware.files
-8f3358ae696bb8adaa3c559a2b5470602b4259c3df310eba9a6a914ef1810a145342eff987f548cbdc076b1cea3fadc4656b048b59f0049c3626151447f33170  deviceinfo
+5e976d15e2ddb9298fce04f4492e4155b6dbaa7295f0f023b79232bf5b6263ae41307538e4d7489b162512432b141b69a72e3e13c192b6607148a86740b06bea  deviceinfo
 e6c5382b6f7dd10f350136d65a714de3ae337978c3ca88e63f016b4a42be87b422d2388fbf6d6a2feba15516fb9b409f6c5ff08968829e6fc2d1e8aeb9d3c508  gpu.conf
 8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080  mpv.conf.wayland
 d6bc39df48ba0e985a796426039205335adf1c91b9c150b05a4239339fc78b1748b3a83c699de69e9a5829f29573a323f40788da58ed15b1951de1eab7e31c3d  mpv.conf.xorg
 78e566bf3a597b9b5f73f686feb93ae61d1bed350366428d74c7735f1f82ab390f47ba9deb9d21e8dfcee251dc6178956838ca1b34838bb0a7d740be0e2c8330  10-no-hardware-cursor.sh
-1a4362e2c1d4eb6f7cf10d7131c1ea91b1e82836b23e2e90c1cae3b13ca77118d46f033b74a1e1281eaab19382985681816500b7a4987ec9979a50f51e5ec238  uboot-script.cmd
 "
diff --git a/device/testing/device-google-nyan-big/deviceinfo b/device/testing/device-google-nyan-big/deviceinfo
index 44fd62db4..63ab0b556 100644
--- a/device/testing/device-google-nyan-big/deviceinfo
+++ b/device/testing/device-google-nyan-big/deviceinfo
@@ -28,3 +28,4 @@ deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="32768"
 deviceinfo_depthcharge_board="big"
 deviceinfo_generate_depthcharge_image="true"
+deviceinfo_generate_extlinux_config="true"
diff --git a/device/testing/device-google-nyan-big/uboot-script.cmd b/device/testing/device-google-nyan-big/uboot-script.cmd
deleted file mode 100644
index 680e4168d..000000000
--- a/device/testing/device-google-nyan-big/uboot-script.cmd
+++ /dev/null
@@ -1,30 +0,0 @@
-if test ${devtype} = "usb" ; then
-	setenv bootargs console=tty1 PMOS_NO_OUTPUT_REDIRECT;
-else 
-	setenv bootargs console=tty1 PMOS_NO_OUTPUT_REDIRECT pmos_boot=/dev/mmcblk${devnum}p2 pmos_root=/dev/mmcblk${devnum}p3;
-fi;
-
-if test -e ${devtype} ${devnum}:2 tegra124-nyan-big.dtb; then
-	echo "Selecting DTB for 1366x768 panel";
-	setenv fdtfile tegra124-nyan-big.dtb;
-else
-	echo "Selecting DTB for 1920x1080 panel";
-	setenv fdtfile tegra124-nyan-big-fhd.dtb;
-fi;
-
-echo Loading DTB
-load ${devtype} ${devnum}:2 ${fdt_addr_r} ${fdtfile}
-
-echo Loading Initramfs
-load ${devtype} ${devnum}:2 ${ramdisk_addr_r} initramfs
-setenv ramdisk_size ${filesize}
-
-echo Loading Kernel
-load ${devtype} ${devnum}:2 ${kernel_addr_r} vmlinuz
-
-echo Resizing FDT
-fdt addr ${fdt_addr_r}
-fdt resize
-
-echo Booting Kernel
-bootz ${kernel_addr_r} ${ramdisk_addr_r}:${ramdisk_size} ${fdt_addr_r}