From 185492156e5f645759746061dc052d6a38b2118f Mon Sep 17 00:00:00 2001
From: Alexey Minnekhanov <alexeymin@postmarketos.org>
Date: Tue, 29 Mar 2022 20:18:19 +0300
Subject: [PATCH] samsung-klte: switch to fastboot and require lk2nd (MR 3044)

To make panel driver upstreamable to mainline linux, we need to use
proper panel selection in secondary bootloader (still TODO), and
therefore lk2nd will be strictly required to boot mainline port.

Switch flashing method to fastboot, enable sparse rootfs generation,
and depend on lk2nd package.

Depends on: postmarketOS/pmbootstrap!2174, to provide full
integration of lk2nd in pmbootstrap.

So, full flashing procedure for samsung-klte will look like:

 $ pmbootstrap init
 $ pmbootstrap install
 $ pmbootstrap flasher --method=heimdall-bootimg flash_lk2nd
 $ pmbootstrap flasher flash_kernel --no-install
 $ pmbootstrap flasher flash_rootfs
 $ fastboot reboot
---
 device/testing/device-samsung-klte/APKBUILD   | 5 +++--
 device/testing/device-samsung-klte/deviceinfo | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/device/testing/device-samsung-klte/APKBUILD b/device/testing/device-samsung-klte/APKBUILD
index 5cecc1d72..bcde7ac9a 100644
--- a/device/testing/device-samsung-klte/APKBUILD
+++ b/device/testing/device-samsung-klte/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F)"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -9,6 +9,7 @@ arch="armv7"
 options="!check !archcheck"
 depends="
 	linux-postmarketos-qcom-msm8974
+	lk2nd-msm8974
 	mesa-dri-gallium
 	mkbootimg
 	postmarketos-base
@@ -49,5 +50,5 @@ nonfree_firmware() {
 
 sha512sums="
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-ddbf2140fdc4b3c50a78a5c946d2bec75debec68a89bfac6e1ad7b112af7c38e916ac056dbe69e266c229e3543427471375d3f5f362dcf35765e86a6bc0f4024  deviceinfo
+fab39759211a269bca415a2359a63794c4f8fa8458f5aae02eac33426ab4f5491c4eb6b554a2c9af993dc7dc2cbd6bf09e29296047b509a211ee162ab5f2b12d  deviceinfo
 "
diff --git a/device/testing/device-samsung-klte/deviceinfo b/device/testing/device-samsung-klte/deviceinfo
index 6ebf7a223..32c1eeb5b 100644
--- a/device/testing/device-samsung-klte/deviceinfo
+++ b/device/testing/device-samsung-klte/deviceinfo
@@ -20,11 +20,11 @@ deviceinfo_screen_height="1920"
 deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_flash_method="fastboot"
+deviceinfo_flash_sparse="true"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 msm.vram=192m msm.allow_vram_carveout=1 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_append_seandroidenforce="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
@@ -32,6 +32,7 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_heimdall_partition_kernel="BOOT"
+deviceinfo_flash_fastboot_partition_kernel="boot"
 
 # USB related
 deviceinfo_usb_idVendor="0x04e8"  # Samsung Electronics Co., Ltd