From 2c6399db1cc8a14b614fd47fc0530604766dba92 Mon Sep 17 00:00:00 2001
From: Anton Bambura <jenneron@protonmail.com>
Date: Thu, 11 May 2023 12:32:59 +0300
Subject: [PATCH] google-nyan-big: switch from secondary u-boot to depthcharge
 (MR 4074)

---
 .../testing/device-google-nyan-big/APKBUILD   | 54 ++++++++++---------
 .../testing/device-google-nyan-big/deviceinfo | 11 ++--
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/device/testing/device-google-nyan-big/APKBUILD b/device/testing/device-google-nyan-big/APKBUILD
index f1af3a179..de9319ec1 100644
--- a/device/testing/device-google-nyan-big/APKBUILD
+++ b/device/testing/device-google-nyan-big/APKBUILD
@@ -3,21 +3,21 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-nyan-big
 pkgdesc="Acer Chromebook 13 CB5-311 / Acer Chromebook C810"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf
+	depthcharge-tools
 	postmarketos-base
+	postmarketos-update-depthcharge-kernel
 "
 subpackages="
-	$pkgname-kernel-nyan-big-2gb:kernel_nyan_big_2gb
-	$pkgname-kernel-nyan-big-2gb-fhd:kernel_nyan_big_4gb_fhd
-	$pkgname-kernel-nyan-big-4gb:kernel_nyan_big_4gb
-	$pkgname-kernel-nyan-big-4gb-fhd:kernel_nyan_big_4gb_fhd
+	$pkgname-kernel-nyan-big:kernel_nyan_big
+	$pkgname-kernel-nyan-big-fhd:kernel_nyan_big_fhd
 	$pkgname-mpv-wayland:mpv_wayland
 	$pkgname-mpv-xorg:mpv_xorg
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -61,27 +61,31 @@ package() {
 		"$pkgdir"/boot/boot.scr
 }
 
-kernel_nyan_big_2gb() {
-	pkgdesc="Google Nyan Big (2 GB)"
-	depends="linux-google-nyan u-boot-nyan-2gb"
+kernel_nyan_big() {
+	pkgdesc="Google Nyan Big"
+	depends="linux-google-nyan>=6.1.27-r0"
+	provides="
+		device-google-nyan-big-kernel-nyan-big-2gb=$pkgver-r$pkgrel
+		device-google-nyan-big-kernel-nyan-big-4gb=$pkgver-r$pkgrel
+		"
+	replaces="
+		device-google-nyan-big-kernel-nyan-big-2gb
+		device-google-nyan-big-kernel-nyan-big-4gb
+		"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-kernel_nyan_big_2gb_fhd() {
-	pkgdesc="Google Nyan Big (2 GB, FullHD)"
-	depends="linux-google-nyan u-boot-nyan-2gb"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_nyan_big_4gb() {
-	pkgdesc="Google Nyan Big (4 GB)"
-	depends="linux-google-nyan u-boot-nyan-4gb"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_nyan_big_4gb_fhd() {
-	pkgdesc="Google Nyan Big (4 GB, FullHD)"
-	depends="linux-google-nyan u-boot-nyan-4gb"
+kernel_nyan_big_fhd() {
+	pkgdesc="Google Nyan Big (FullHD)"
+	depends="linux-google-nyan>=6.1.27-r0"
+	provides="
+		device-google-nyan-big-kernel-nyan-big-2gb-fhd=$pkgver-r$pkgrel
+		device-google-nyan-big-kernel-nyan-big-4gb-fhd=$pkgver-r$pkgrel
+		"
+	replaces="
+		device-google-nyan-big-kernel-nyan-big-2gb-fhd
+		device-google-nyan-big-kernel-nyan-big-4gb-fhd
+		"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
@@ -116,7 +120,7 @@ sway() {
 
 sha512sums="
 793688374d77efaf050c187d296d7fd55243773a1257b4d8adfa4cda50d4c0cacc035fb3d419a4b608989ed920636048680d900afe8a712f2166edf51552087a  30-xusb-firmware.files
-0d63dbe93ab173a3939edb2b2226ddd8b4a20757053938df3538134ffa21ba218d048387e761b7a4f83f71cf906f976b6cd694e8c0b2ea7434e7ab2598b9392b  deviceinfo
+8f3358ae696bb8adaa3c559a2b5470602b4259c3df310eba9a6a914ef1810a145342eff987f548cbdc076b1cea3fadc4656b048b59f0049c3626151447f33170  deviceinfo
 e6c5382b6f7dd10f350136d65a714de3ae337978c3ca88e63f016b4a42be87b422d2388fbf6d6a2feba15516fb9b409f6c5ff08968829e6fc2d1e8aeb9d3c508  gpu.conf
 8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080  mpv.conf.wayland
 d6bc39df48ba0e985a796426039205335adf1c91b9c150b05a4239339fc78b1748b3a83c699de69e9a5829f29573a323f40788da58ed15b1951de1eab7e31c3d  mpv.conf.xorg
diff --git a/device/testing/device-google-nyan-big/deviceinfo b/device/testing/device-google-nyan-big/deviceinfo
index 09f4983de..44fd62db4 100644
--- a/device/testing/device-google-nyan-big/deviceinfo
+++ b/device/testing/device-google-nyan-big/deviceinfo
@@ -8,10 +8,8 @@ deviceinfo_manufacturer="Acer"
 deviceinfo_codename="google-nyan-big"
 deviceinfo_year="2014"
 deviceinfo_arch="armv7"
-deviceinfo_dtb_nyan_big_2gb="tegra124-nyan-big"
-deviceinfo_dtb_nyan_big_2gb_fhd="tegra124-nyan-big-fhd"
-deviceinfo_dtb_nyan_big_4gb="tegra124-nyan-big"
-deviceinfo_dtb_nyan_big_4gb_fhd="tegra124-nyan-big-fhd"
+deviceinfo_dtb_nyan_big="tegra124-nyan-big"
+deviceinfo_dtb_nyan_big_fhd="tegra124-nyan-big-fhd"
 deviceinfo_modules_initfs="cros-ec cros-ec-spi cros-ec-keyb"
 
 # Device related
@@ -24,6 +22,9 @@ deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_cgpt_kpart="/usr/share/u-boot/google-nyan-big/u-boot-dtb.img.kpart"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="big"
+deviceinfo_generate_depthcharge_image="true"