From f77fb2e6108f7c6ca93eb2dc7df6a399cbca5b73 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 3 May 2023 18:13:17 +0200
Subject: [PATCH] testing/device-asus-sparrow: add mainline subpackages (MR
 4053)

---
 device/testing/device-asus-sparrow/APKBUILD   | 30 ++++++++++++++++---
 device/testing/device-asus-sparrow/deviceinfo |  4 ++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/device/testing/device-asus-sparrow/APKBUILD b/device/testing/device-asus-sparrow/APKBUILD
index 7bde2ad01..9d6151a46 100644
--- a/device/testing/device-asus-sparrow/APKBUILD
+++ b/device/testing/device-asus-sparrow/APKBUILD
@@ -1,18 +1,22 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-sparrow
 pkgdesc="ASUS ZenWatch 2"
-pkgver=0.2
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
-	linux-asus-sparrow
 	mkbootimg
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware
+	"
 source="deviceinfo"
 
 build() {
@@ -23,6 +27,24 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-asus-sparrow"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel"
+	depends="linux-postmarketos-qcom-msm8226"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="Firmware for WiFi, ADSP, etc."
+	depends="firmware-asus-sparrow-adsp firmware-asus-sparrow-wifi"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-85b35095c21987644b6710b0d162b64edb5d520e8c6851f6880891c175263d083ab39ca2c012983d32053f7b2c23626e1ce3b726fcfe1c151bc73d6f9edf0b08  deviceinfo
+8ab382e2c83d0d1014f9c77cf580f37c354329da9ec10511ce6db635489037cf62f941ce6ca00814548513fe13c490cdf18cc4731a0afa3ef26135351519ffe0  deviceinfo
 "
diff --git a/device/testing/device-asus-sparrow/deviceinfo b/device/testing/device-asus-sparrow/deviceinfo
index 2b44113d6..6f563c3df 100644
--- a/device/testing/device-asus-sparrow/deviceinfo
+++ b/device/testing/device-asus-sparrow/deviceinfo
@@ -20,7 +20,9 @@ deviceinfo_screen_height="320"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=sparrow user_debug=31 maxcpus=4 msm_rtb.filter=0x3F"
+# limit to single-core until we have cpufreq to avoid fast overheating
+deviceinfo_kernel_cmdline_mainline="maxcpus=1"
+deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=sparrow user_debug=31 maxcpus=4 msm_rtb.filter=0x3F"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"