From c72f4346d26b26d52c265dbccb0a1cf791f7143a Mon Sep 17 00:00:00 2001
From: Alexandre Messier <alex@me.ssier.org>
Date: Wed, 13 Mar 2024 01:43:10 -0400
Subject: [PATCH] device-htc-m8: add support for near-mainline kernel (MR 5018)

Add option to use near-mainline kernel package
linux-postmarketos-qcom-msm8974.

[ci:skip-build]: already built successfully in CI
---
 device/testing/device-htc-m8/APKBUILD   | 35 ++++++++++++++++++++-----
 device/testing/device-htc-m8/deviceinfo |  7 +++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/device/testing/device-htc-m8/APKBUILD b/device/testing/device-htc-m8/APKBUILD
index fcf2b80d6..f1d000b12 100644
--- a/device/testing/device-htc-m8/APKBUILD
+++ b/device/testing/device-htc-m8/APKBUILD
@@ -1,18 +1,27 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-m8
 pkgdesc="HTC One M8"
-pkgver=0.1
-pkgrel=18
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="linux-htc-m8 mkbootimg msm-fb-refresher postmarketos-base"
+depends="
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
+source="
+	deviceinfo
 	initfs-hook.sh
-	90-android-touch-dev.rules"
+	90-android-touch-dev.rules
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -24,6 +33,18 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-htc-m8 msm-fb-refresher"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel"
+	depends="linux-postmarketos-qcom-msm8974"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-htc-m8"
@@ -31,7 +52,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-59f810d4a7c64a8469f198e434af8e54fca9ecc37f3f622273c0bc6d0883e28380cfd2c206322807a5796886023d30220f025e211287cf1454d291061bc2bb48  deviceinfo
+ee05a21c7dee368c6cd74f35f0dcf125dbff3938a689ac0f4626643c43e9297ce2a8af15af09153e832af00b50b0e578707232ef990ea7dcabe9141de0a27cad  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
 f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66  90-android-touch-dev.rules
 "
diff --git a/device/testing/device-htc-m8/deviceinfo b/device/testing/device-htc-m8/deviceinfo
index 9f8c6d543..6b277e7fd 100644
--- a/device/testing/device-htc-m8/deviceinfo
+++ b/device/testing/device-htc-m8/deviceinfo
@@ -7,6 +7,8 @@ deviceinfo_manufacturer="HTC"
 deviceinfo_codename="htc-m8"
 deviceinfo_year="2014"
 deviceinfo_arch="armv7"
+deviceinfo_dtb_mainline="qcom-msm8974pro-htc-m8"
+deviceinfo_append_dtb_mainline="true"
 
 # Device related
 deviceinfo_chassis="handset"
@@ -16,9 +18,10 @@ deviceinfo_external_storage="true"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_fastboot_partition_rootfs="system"
-deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache androidboot.selinux=permissive"
+deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache androidboot.selinux=permissive"
+deviceinfo_kernel_cmdline_mainline="console=tty0 PMOS_NOSPLASH PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02008000"