From db7766d24e5319268dd9cae794599edbb0d058f2 Mon Sep 17 00:00:00 2001
From: Pangwalla <pangwalla@protonmail.com>
Date: Mon, 10 Apr 2023 16:26:41 -0400
Subject: [PATCH] device-oneplus-instantnoodlep: add sm8250 mainline kernel (MR
 4002)

---
 .../device-oneplus-instantnoodlep/APKBUILD    | 23 ++++++++++++++++---
 .../sm8250-oneplus-instantnoodlep-empty.dts   | 10 ++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 device/testing/device-oneplus-instantnoodlep/sm8250-oneplus-instantnoodlep-empty.dts

diff --git a/device/testing/device-oneplus-instantnoodlep/APKBUILD b/device/testing/device-oneplus-instantnoodlep/APKBUILD
index 14513385a..3b9c67fc9 100644
--- a/device/testing/device-oneplus-instantnoodlep/APKBUILD
+++ b/device/testing/device-oneplus-instantnoodlep/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-oneplus-instantnoodlep
 pkgdesc="OnePlus 8 Pro"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,12 +11,19 @@ depends="
 	mkbootimg
 	postmarketos-base
 "
-makedepends="devicepkg-dev"
+makedepends="
+	devicepkg-dev
+	dtc
+"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
-source="deviceinfo"
+source="
+	deviceinfo
+	sm8250-oneplus-instantnoodlep-empty.dts
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -32,6 +39,15 @@ kernel_downstream() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+kernel_mainline() {
+	pkgdesc="Mainline kernel (recommended)"
+	depends="linux-postmarketos-qcom-sm8250"
+
+	dtc -O dtb -o "$srcdir/dtbo.img" -I dts "$srcdir/sm8250-oneplus-instantnoodlep-empty.dts"
+	install -Dm644 "$srcdir/dtbo.img" "$subpkgdir/boot/dtbo.img"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Firmware for OnePlus 8 Pro"
 	depends="firmware-oneplus-instantnoodlep"
@@ -40,4 +56,5 @@ nonfree_firmware() {
 
 sha512sums="
 e6f01d250e86dd8f2ec60019bc470b5c6adb5e271dff9bd8420268709f33691db2a756194664539edd95f201ccf69301f953e644a87b298500561c02d0898792  deviceinfo
+06269dcbd405a18576a476bb976d39bcf91e8c7885a87716f510d66abc2ffe3bfabe56c286ad6fc88878de07427e58965ac833ac0e8cfa7ad393c2fa3b535c88  sm8250-oneplus-instantnoodlep-empty.dts
 "
diff --git a/device/testing/device-oneplus-instantnoodlep/sm8250-oneplus-instantnoodlep-empty.dts b/device/testing/device-oneplus-instantnoodlep/sm8250-oneplus-instantnoodlep-empty.dts
new file mode 100644
index 000000000..0ca183722
--- /dev/null
+++ b/device/testing/device-oneplus-instantnoodlep/sm8250-oneplus-instantnoodlep-empty.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+/ {
+	model = "Qualcomm Technologies, Inc. kona v2.1 SoC 19805";
+	compatible = "qcom,kona";
+	chassis-type = "handset";
+
+	qcom,msm-id = <356 0x10000>;
+	qcom,board-id = <8 0>;
+};