main/lk2nd: upgrade to 19.0 (MR 5691)
lk2nd 19.0 supports new platforms and simplifies image formats.
This commit is contained in:
Barnabás Czémán
Robert Eckelmann
parent
378cbbb235
commit
c6e0ce6379
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,58 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,15 +1,23 @@
|
|||
# Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org>
|
||||
pkgname=lk2nd
|
||||
pkgver=0.16.0
|
||||
pkgver=19.0
|
||||
pkgrel=0
|
||||
pkgdesc="Secondary little kernel (lk) bootloader for several Qualcomm devices"
|
||||
arch="armv7 aarch64"
|
||||
url="https://github.com/msm8916-mainline/lk2nd"
|
||||
license="MIT AND BSD-3-Clause AND GPL-2.0-only"
|
||||
makedepends="dtc dtc-dev gcc-arm-none-eabi python3 py3-libfdt"
|
||||
makedepends="
|
||||
dtc
|
||||
dtc-dev
|
||||
gcc-arm-none-eabi
|
||||
python3
|
||||
py3-asn1-modules
|
||||
py3-libfdt
|
||||
py3-pycryptodome
|
||||
"
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://github.com/msm8916-mainline/lk2nd/archive/refs/tags/$pkgver.tar.gz
|
||||
0001-build-fixes.patch
|
||||
0001-doc-dts-msm8974-Remove-hammerhead-from-qcdtbs-and-do.patch
|
||||
"
|
||||
options="!check !archcheck !tracedeps !strip pmb:cross-native"
|
||||
# This APKBUILD builds bare metal executable; options are very specific!
|
||||
|
|
@ -21,17 +29,19 @@ options="!check !archcheck !tracedeps !strip pmb:cross-native"
|
|||
|
||||
subpackages="
|
||||
$pkgname-msm8916
|
||||
$pkgname-msm8916-appended:msm8916_appended
|
||||
$pkgname-msm8952
|
||||
$pkgname-msm8952-xiaomi-land:msm8952_xiaomi_land
|
||||
$pkgname-msm8953
|
||||
$pkgname-msm8953-signed:msm8953_signed
|
||||
"
|
||||
|
||||
if [ "$CARCH" = "armv7" ]; then
|
||||
subpackages="
|
||||
$subpackages
|
||||
$pkgname-msm8226
|
||||
$pkgname-msm8226-appended:msm8226_appended
|
||||
$pkgname-msm8226-htc-memul:msm8226_htc_memul
|
||||
$pkgname-msm8974
|
||||
$pkgname-msm8974-appended:msm8974_appended
|
||||
$pkgname-msm8974-lg-hammerhead:msm8974_lg_hammerhead
|
||||
"
|
||||
fi
|
||||
|
||||
|
|
@ -58,8 +68,13 @@ _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" = "armv7" ]; then
|
||||
_build lk2nd-msm8974
|
||||
_build lk2nd-msm8974 BOOTLOADER_OUT=lg-hammerhead LK2ND_QCDTBS=""
|
||||
_build lk2nd-msm8226
|
||||
_build lk2nd-msm8226 BOOTLOADER_OUT=htc-memul SCRATCH_ADDR=0x20000000 SCRATCH_ADDR_512MAP=0x20000000 SCRATCH_SIZE_512MAP=0x10000000
|
||||
fi
|
||||
|
|
@ -75,9 +90,24 @@ msm8916() {
|
|||
"$subpkgdir"/boot
|
||||
}
|
||||
|
||||
msm8916_appended() {
|
||||
install -Dm644 "$builddir"/build-lk2nd-msm8916/lk2nd-appended-dtb.img \
|
||||
"$subpkgdir"/boot/lk2nd.img
|
||||
msm8952() {
|
||||
install -Dm644 "$builddir"/build-lk2nd-msm8952/lk2nd.img -t \
|
||||
"$subpkgdir"/boot
|
||||
}
|
||||
|
||||
msm8952_xiaomi_land() {
|
||||
install -Dm644 "$builddir"/xiaomi-land/build-lk2nd-msm8952/lk2nd.img -t \
|
||||
"$subpkgdir"/boot
|
||||
}
|
||||
|
||||
msm8953() {
|
||||
install -Dm644 "$builddir"/build-lk2nd-msm8953/lk2nd.img -t \
|
||||
"$subpkgdir"/boot
|
||||
}
|
||||
|
||||
msm8953_signed() {
|
||||
install -Dm644 "$builddir"/msm8953-signed/build-lk2nd-msm8953/lk2nd.img -t \
|
||||
"$subpkgdir"/boot
|
||||
}
|
||||
|
||||
msm8974() {
|
||||
|
|
@ -85,9 +115,9 @@ msm8974() {
|
|||
"$subpkgdir"/boot
|
||||
}
|
||||
|
||||
msm8974_appended() {
|
||||
install -Dm644 "$builddir"/build-lk2nd-msm8974/lk2nd-appended-dtb.img \
|
||||
"$subpkgdir"/boot/lk2nd.img
|
||||
msm8974_lg_hammerhead() {
|
||||
install -Dm644 "$builddir"/lg-hammerhead/build-lk2nd-msm8974/lk2nd.img -t \
|
||||
"$subpkgdir"/boot
|
||||
}
|
||||
|
||||
msm8226() {
|
||||
|
|
@ -95,17 +125,12 @@ msm8226() {
|
|||
"$subpkgdir"/boot/lk2nd.img
|
||||
}
|
||||
|
||||
msm8226_appended() {
|
||||
install -Dm644 "$builddir"/build-lk2nd-msm8226/lk2nd-appended-dtb.img \
|
||||
"$subpkgdir"/boot/lk2nd.img
|
||||
}
|
||||
|
||||
msm8226_htc_memul() {
|
||||
install -Dm644 "$builddir"/htc-memul/build-lk2nd-msm8226/lk2nd.img \
|
||||
"$subpkgdir"/boot/lk2nd.img
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
e3708b02f7bf677c60b9f09e75d70c05438466c62378294b31109c9085bfaf5e25598c91a841dc2756367b5cb069e10d9df56c1d1b174ba07b8fd2017487c5c2 lk2nd-0.16.0.tar.gz
|
||||
e0ff876f69950cd3026d0168edc7e32d1f671a448153ee3c1dcf8906aed3c67b91bdd3e1ea73e789c7d85fbf2bebd42054dd89ae486d1921df456f606a7e82d2 0001-build-fixes.patch
|
||||
5c7b69277b255b4e29849940b9eca90de8d21c5851719bdb519c1323844014ac6519995c43ed5ea874a64df5845305df3fcf56b141e782d77a4c2cac3deda82a lk2nd-19.0.tar.gz
|
||||
7aa4b7c98e990d3f2f44be2e24873829b75aa72b423966fb20b26d8c4fede9ce04495f8f37df54ae817297986bcb86ae7879174ca1d255c12b25656dbacaa62b 0001-doc-dts-msm8974-Remove-hammerhead-from-qcdtbs-and-do.patch
|
||||
"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user