From b26e5287f70122df30de36f75f72ae8684bcb8e3 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Thu, 21 Jul 2022 20:41:36 -0700
Subject: [PATCH] device-oneplus-lemonade: support header v2 (MR 3297)

Co-authored-by: Jami Kettunen <jami.kettunen@protonmail.com>
[ci:skip-build]: already built successfully in CI
---
 device/testing/device-oneplus-lemonade/APKBUILD   | 6 +++---
 device/testing/device-oneplus-lemonade/deviceinfo | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/device/testing/device-oneplus-lemonade/APKBUILD b/device/testing/device-oneplus-lemonade/APKBUILD
index 31b66fc46..1fa45cb73 100644
--- a/device/testing/device-oneplus-lemonade/APKBUILD
+++ b/device/testing/device-oneplus-lemonade/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-lemonade
 pkgdesc="OnePlus 9 & 9 Pro"
-pkgver=0.1
-pkgrel=1
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -50,7 +50,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-bcd014961747e5ce2d09a2c69af5b80067c0b500f788d519594f548a85de61f96d7555a107d65ba3746ba69ecf1f160409f5110a33c1f10c75604a7d50df3a49  deviceinfo
+69666f895a4e8f0d9d87d0f1e37a7bdb62f08880151deb7450d3f774ec7fb61a1b1b263588e90bd403c3961d74d57e2c256ee02e3ef07e771700b57b94292f8a  deviceinfo
 cf3bde87540de9a94d253ab211ca9d6ca426e062237db3ab6ec5dfcdb35c161fdfc22837ca696dd27ee5a371157186a5e65b8de33dcc69ce49b7a9584fdce51c  empty-oneplus-lemonade.dts
 cd5d0daff0f156c6f8e2b987a84199cf6d6cd4190b4e91f81465230d9a39f8dba6e25b1aa995b9da829ba940fcf25c43f5c32ae0c041f16901e343dabcf332b8  empty-oneplus-lemonadep.dts
 "
diff --git a/device/testing/device-oneplus-lemonade/deviceinfo b/device/testing/device-oneplus-lemonade/deviceinfo
index 8f8c7b915..655bdb7b7 100644
--- a/device/testing/device-oneplus-lemonade/deviceinfo
+++ b/device/testing/device-oneplus-lemonade/deviceinfo
@@ -21,7 +21,6 @@ deviceinfo_screen_height="2400"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="rd.rootfs=super:4096 fw_devlink=permissive clk_ignore_unused PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_custom_args="--header_version 2 --dtb_offset 0x0000000001f00000 --dtb /usr/share/dtb/qcom/sm8350-oneplus-lemonade.dtb"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
@@ -30,7 +29,9 @@ deviceinfo_flash_sparse="true"
 deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
 deviceinfo_flash_fastboot_partition_dtbo="dtbo"
 deviceinfo_flash_fastboot_partition_system="super"
+deviceinfo_header_version="2"
 deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_dtb="0x01f00000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00000000"