diff --git a/main/lk2nd/0001-doc-dts-msm8974-Remove-hammerhead-from-qcdtbs-and-do.patch b/main/lk2nd/0001-doc-dts-msm8974-Remove-hammerhead-from-qcdtbs-and-do.patch
deleted file mode 100644
index 002296d614df217a6ff417a9978ef447a38f3d7f..0000000000000000000000000000000000000000
--- a/main/lk2nd/0001-doc-dts-msm8974-Remove-hammerhead-from-qcdtbs-and-do.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2511df692a8e230a2f6d00b76be3d9a9f791a459 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
-Date: Wed, 16 Oct 2024 22:53:32 +0200
-Subject: [PATCH] doc/dts: msm8974: Remove hammerhead from qcdtbs and document
- the quirks
-
-LG Nexus 5 (hammerhead) should not be added for QCDTBS list it breaks
-other devices. It works with ADTBS and QCDTBS list should be empty.
----
- Documentation/devices.md | 2 +-
- lk2nd/device/dts/msm8974/msm8974-lge-hammerhead.dts | 5 +++++
- lk2nd/device/dts/msm8974/rules.mk | 1 -
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/Documentation/devices.md b/Documentation/devices.md
-index 86162199b..5b71f6bf2 100644
---- a/Documentation/devices.md
-+++ b/Documentation/devices.md
-@@ -121,7 +121,7 @@
- - Fairphone 2 - FP2
- - HTC One M8 - m8
- - LG G3 - D855
--- LG Google Nexus 5 - hammerhead D820, D821
-+- LG Google Nexus 5 - hammerhead D820, D821 (quirky - see comment in `lk2nd/device/dts/msm8974/msm8974-lge-hammerhead.dts`)
- - Motorola Moto X 2014 - victara
- - OnePlus One - bacon <!--(use `lk2nd-msm8974-appended-dtb.img`)-->
- - Samsung Galaxy Note 3 - SM-N9005
-diff --git a/lk2nd/device/dts/msm8974/msm8974-lge-hammerhead.dts b/lk2nd/device/dts/msm8974/msm8974-lge-hammerhead.dts
-index 10104253e..ea1790961 100644
---- a/lk2nd/device/dts/msm8974/msm8974-lge-hammerhead.dts
-+++ b/lk2nd/device/dts/msm8974/msm8974-lge-hammerhead.dts
-@@ -3,6 +3,11 @@
- #include <skeleton64.dtsi>
- #include <lk2nd.dtsi>
-
-+/*
-+ * To build for hammerhead, add LK2ND_QCDTBS="" to your make cmdline
-+ * hammerhead does not work with qcdtbs enabled.
-+ */
-+
- / {
- qcom,msm-id = <QCOM_ID_MSM8974 0x96 0x20002 0xb>;
- };
-diff --git a/lk2nd/device/dts/msm8974/rules.mk b/lk2nd/device/dts/msm8974/rules.mk
-index 1a2ffc24b..1358585b6 100644
---- a/lk2nd/device/dts/msm8974/rules.mk
-+++ b/lk2nd/device/dts/msm8974/rules.mk
-@@ -7,7 +7,6 @@ QCDTBS += \
- $(LOCAL_DIR)/msm8974pro-ac-pm8941-mtp.dtb \
- $(LOCAL_DIR)/msm8974-htc-m8.dtb \
- $(LOCAL_DIR)/msm8974-lge-d855.dtb \
-- $(LOCAL_DIR)/msm8974-lge-hammerhead.dtb \
-
- ADTBS += \
- $(LOCAL_DIR)/msm8974-lge-hammerhead.dtb \
---
-2.47.0
-
diff --git a/main/lk2nd/0002-dts-msm8953-Fix-daisy-dts.patch b/main/lk2nd/0002-dts-msm8953-Fix-daisy-dts.patch
deleted file mode 100644
index 899b87e95086470519d626ac44bf49226474f387..0000000000000000000000000000000000000000
--- a/main/lk2nd/0002-dts-msm8953-Fix-daisy-dts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lk2nd/device/dts/msm8953/msm8953-xiaomi-daisy.dts b/lk2nd/device/dts/msm8953/msm8953-xiaomi-daisy.dts
-index 8a78e5f2..0087e3bd 100644
---- a/lk2nd/device/dts/msm8953/msm8953-xiaomi-daisy.dts
-+++ b/lk2nd/device/dts/msm8953/msm8953-xiaomi-daisy.dts
-@@ -7,7 +7,7 @@
-
- / {
- qcom,msm-id = <QCOM_ID_MSM8953 0>;
-- qcom,board-id = <QCOM_BOARD_ID(MTP, 1, 0) 0x09>;
-+ qcom,board-id = <QCOM_BOARD_ID(QRD, 1, 0) 0x09>;
- };
-
- &lk2nd {
diff --git a/main/lk2nd/APKBUILD b/main/lk2nd/APKBUILD
index 5ac0d10dc3eb15156dcd0f3d36f262a59637a504..a7363c3e28aa667eb9b6439257083ee89ff425b4 100644
--- a/main/lk2nd/APKBUILD
+++ b/main/lk2nd/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org>
pkgname=lk2nd
-pkgver=19.0
+pkgver=20.0
pkgrel=1
pkgdesc="Secondary little kernel (lk) bootloader for several Qualcomm devices"
arch="armv7 aarch64"
@@ -17,8 +17,6 @@ makedepends="
"
source="
$pkgname-$pkgver.tar.gz::https://github.com/msm8916-mainline/lk2nd/archive/refs/tags/$pkgver.tar.gz
- 0001-doc-dts-msm8974-Remove-hammerhead-from-qcdtbs-and-do.patch
- 0002-dts-msm8953-Fix-daisy-dts.patch
"
options="!check !archcheck !tracedeps !strip pmb:cross-native"
# This APKBUILD builds bare metal executable; options are very specific!
@@ -31,10 +29,16 @@ options="!check !archcheck !tracedeps !strip pmb:cross-native"
subpackages="
$pkgname-msm8916
$pkgname-msm8952
- $pkgname-msm8952-xiaomi-land:msm8952_xiaomi_land
- $pkgname-msm8953
- $pkgname-msm8953-signed:msm8953_signed
"
+if [ "$CARCH" = "aarch64" ]; then
+ subpackages="
+ $subpackages
+ $pkgname-msm8952-xiaomi-land:msm8952_xiaomi_land
+ $pkgname-msm8953
+ $pkgname-msm8953-signed:msm8953_signed
+ $pkgname-msm8996
+ "
+fi
if [ "$CARCH" = "armv7" ]; then
subpackages="
@@ -70,9 +74,14 @@ _build() {
build() {
_build lk2nd-msm8916
_build lk2nd-msm8952
- _build lk2nd-msm8952 BOOTLOADER_OUT=xiaomi-land LK2ND_DTBS="" LK2ND_ADTBS="msm8937-xiaomi-land.dtb"
- _build lk2nd-msm8953
- _build lk2nd-msm8953 BOOTLOADER_OUT=msm8953-signed SIGN_BOOTIMG=1
+
+ if [ "$CARCH" = "aarch64" ]; then
+ _build lk2nd-msm8952 BOOTLOADER_OUT=xiaomi-land LK2ND_DTBS="" LK2ND_ADTBS="msm8937-xiaomi-land.dtb"
+ _build lk2nd-msm8953
+ _build lk2nd-msm8953 BOOTLOADER_OUT=msm8953-signed SIGN_BOOTIMG=1
+ _build lk2nd-msm8996
+ fi
+
if [ "$CARCH" = "armv7" ]; then
_build lk2nd-msm8974
_build lk2nd-msm8974 BOOTLOADER_OUT=lg-hammerhead LK2ND_QCDTBS=""
@@ -121,6 +130,11 @@ msm8974_lg_hammerhead() {
"$subpkgdir"/boot
}
+msm8996() {
+ install -Dm644 "$builddir"/build-lk2nd-msm8996/lk2nd.img \
+ "$subpkgdir"/boot/lk2nd.img
+}
+
msm8226() {
install -Dm644 "$builddir"/build-lk2nd-msm8226/lk2nd.img \
"$subpkgdir"/boot/lk2nd.img
@@ -132,7 +146,5 @@ msm8226_htc_memul() {
}
sha512sums="
-5c7b69277b255b4e29849940b9eca90de8d21c5851719bdb519c1323844014ac6519995c43ed5ea874a64df5845305df3fcf56b141e782d77a4c2cac3deda82a lk2nd-19.0.tar.gz
-7aa4b7c98e990d3f2f44be2e24873829b75aa72b423966fb20b26d8c4fede9ce04495f8f37df54ae817297986bcb86ae7879174ca1d255c12b25656dbacaa62b 0001-doc-dts-msm8974-Remove-hammerhead-from-qcdtbs-and-do.patch
-d30b03a65d535f9bab9986cec55cea1c0c797c7e2eca3660d072885e3d8d66dad7c97861c59dbe365b3a15699cc0b59dc35a363f6555541ab2e35660a89d0003 0002-dts-msm8953-Fix-daisy-dts.patch
+50b949f7ebacfe17919dc2d3538f5fbbc1b9055adadf4cdecdaee59f64be137dedb69b04dd9604bdd956ad8d12aebe913cc2c3981b9214a02a5036de3c7c1df3 lk2nd-20.0.tar.gz
"