From 710b9f84997f2bdeba87d59514132d99f56cae67 Mon Sep 17 00:00:00 2001 From: Alexandre Messier Date: Mon, 14 Oct 2024 00:42:37 -0400 Subject: [PATCH] device-htc-m8: add lk2nd dependency (MR 5919) Like most msm8974 devices, lk2nd is used to boot mainline linux on the HTC One (M8). Add it as a dependency of the mainline kernel build, so that it is built when required. It can be flashed with 'pmbootstrap flasher flash_lk2nd' while in the vendor bootloader fastboot mode. Only extlinux mode is supported for mainline kernel, as otherwise the initramfs is too big for the boot partition. Signed-off-by: Alexandre Messier --- device/testing/device-htc-m8/APKBUILD | 8 ++++---- device/testing/device-htc-m8/deviceinfo | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/device/testing/device-htc-m8/APKBUILD b/device/testing/device-htc-m8/APKBUILD index 1a2b22d13..18301fb89 100644 --- a/device/testing/device-htc-m8/APKBUILD +++ b/device/testing/device-htc-m8/APKBUILD @@ -1,8 +1,8 @@ # Reference: pkgname=device-htc-m8 pkgdesc="HTC One M8" -pkgver=1 -pkgrel=2 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -42,7 +42,7 @@ kernel_downstream() { kernel_mainline() { pkgdesc="Close to mainline kernel" - depends="linux-postmarketos-qcom-msm8974" + depends="linux-postmarketos-qcom-msm8974 lk2nd-msm8974-htc-m8" devicepkg_subpackage_kernel $startdir $pkgname $subpkgname } @@ -53,7 +53,7 @@ nonfree_firmware() { } sha512sums=" -596b3e77947cffe9c20d8e679aca1e8620b41dd9f516a6625fbf4985eefcf875eec246d32ae2f9943aed0c0fc98c84c56ff047a9ea38f10e287219cf05128217 deviceinfo +697e5942ee2f900e4827495cc4deb4e2eaf76329146c554410d1e9c234d10026bf1a1bb655048d099753dc270d0c4cba2207f592c49bf06a5153dee7fa65c8e4 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 f06b8d685..a12ea6854 100644 --- a/device/testing/device-htc-m8/deviceinfo +++ b/device/testing/device-htc-m8/deviceinfo @@ -21,6 +21,7 @@ deviceinfo_flash_fastboot_partition_rootfs="system" 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" deviceinfo_generate_bootimg="true" +deviceinfo_generate_extlinux_config_mainline="true" deviceinfo_bootimg_qcdt_downstream="true" deviceinfo_flash_offset_base="0x00000000" deviceinfo_flash_offset_kernel="0x00008000" @@ -29,3 +30,6 @@ deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x01e00000" deviceinfo_flash_pagesize="2048" deviceinfo_flash_sparse="true" + +# lk2nd does not support GPT for subpartitions/SD cards yet +deviceinfo_partition_type_mainline="msdos"