From e111c95cadb87e7d7f456e500d6d3d97a04cfe40 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Tue, 12 Oct 2021 20:56:48 +0200
Subject: [PATCH] huawei-angler: adapt for mainline kernel support (MR 2411)

Now the user can choose to install the proprietary firmware along with
the downstream kernel (linux-huawei-angler) or a mainline kernel
(linux-postmarketos-qcom-msm8994).

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>

[ci:skip-build] Already built on CI in MR
---
 device/testing/device-huawei-angler/APKBUILD  | 32 ++++++++++++++++---
 .../testing/device-huawei-angler/deviceinfo   |  9 +++++-
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/device/testing/device-huawei-angler/APKBUILD b/device/testing/device-huawei-angler/APKBUILD
index fe7096024..8d38d5b75 100644
--- a/device/testing/device-huawei-angler/APKBUILD
+++ b/device/testing/device-huawei-angler/APKBUILD
@@ -1,14 +1,24 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-angler
-pkgver=1
-pkgrel=20
+pkgver=2
+pkgrel=0
 pkgdesc="Huawei Nexus 6P"
 url="https://postmarketos.org"
 arch="aarch64"
 license="MIT"
-depends="postmarketos-base linux-huawei-angler mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="
+	mesa-dri-swrast
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+	postmarketos-update-kernel
+"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
@@ -24,6 +34,18 @@ build() {
 	devicepkg_build $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-huawei-angler"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel (only basic hardware support)"
+	depends="linux-postmarketos-qcom-msm8994"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 package() {
 	devicepkg_package $startdir $pkgname
 	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
@@ -39,7 +61,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-20f720152a01749e3dc026119a99dbf5097535dbdf44b5e0050088ba6612cafbfd6e4dfe50a15da8d7dacaf956e372921288f046701641ef0601b27ed1538d8d  deviceinfo
+c964279eba16e5bb4e74bb4389144e51463419e6ba8731363dc07609a6c9effa43ea8de0192f3983c704c9fb8f55e0ee5023f6e3f19cee781feae81daca7200f  deviceinfo
 262f9f3e28cbb28d236cf6edce4919766baabb18e5b0cf35d672d306efeaf12fd66ffba57e6d9bef0eee90203dc98f95aab17145e4c12383055afb58b922ae58  90-android-touch-dev.rules
 61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e  bcmdhd.cal
 "
diff --git a/device/testing/device-huawei-angler/deviceinfo b/device/testing/device-huawei-angler/deviceinfo
index 5884c6d60..b8a3c4b54 100644
--- a/device/testing/device-huawei-angler/deviceinfo
+++ b/device/testing/device-huawei-angler/deviceinfo
@@ -24,5 +24,12 @@ deviceinfo_flash_offset_ramdisk="0x02000000"
 # Angler doesn't have a second in the boot.img. This is a placeholder value for mkbootimg
 deviceinfo_flash_offset_second="0x00000000"
 deviceinfo_flash_offset_tags="0x01e00000"
-deviceinfo_kernel_cmdline="androidboot.hardware=angler androidboot.console=ttyHSL0 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 boot_cpus=0-3"
 deviceinfo_flash_pagesize="4096"
+
+# Downstream kernel options
+deviceinfo_kernel_cmdline_downstream="androidboot.hardware=angler androidboot.console=ttyHSL0 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 boot_cpus=0-3"
+
+# Mainline kernel options
+deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb_mainline="qcom/msm8994-angler-rev-101"
+deviceinfo_kernel_cmdline_mainline="console=tty0 console=ttyMSM0,115200,n8 debug ignore_loglevel PMOS_NO_OUTPUT_REDIRECT earlycon"