device-lg-hammerhead: use lk2nd-msm8974-lge-hammerhead

Switch to lk2nd-msm8974 because separate appended
dtb image build is not needed anymore.

device/testing/device-lg-hammerhead/APKBUILD

@@ -1,14 +1,14 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
 pkgver=8
-pkgrel=0
+pkgrel=1
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
 depends="
 	linux-postmarketos-qcom-msm8974
-	lk2nd-msm8974
+	lk2nd-msm8974-lge-hammerhead
 	mkbootimg
 	postmarketos-base
 	swclock-offset

device/testing/device-motorola-ali/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-motorola-ali
 pkgdesc="Motorola Moto G6"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ depends="
 	firmware-motorola-ali
 	firmware-qcom-adreno-a530
 	linux-postmarketos-qcom-msm8953
-	lk2nd-msm8953-motorola-ali
+	lk2nd-msm8953
 	mkbootimg
 	msm-firmware-loader
 	postmarketos-base

device/testing/device-oneplus-bacon/APKBUILD

@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
 pkgver=4
-pkgrel=0
+pkgrel=1
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
 depends="
-	lk2nd-msm8974-appended
+	lk2nd-msm8974
 	mkbootimg
 	postmarketos-base
 	"

main/lk2nd-msm8953/APKBUILD

@@ -1,63 +0,0 @@
-# Maintainer: Alejandro Tafalla <atafalla@dnyon.com>
-pkgname=lk2nd-msm8953
-pkgver=0.3.9
-pkgrel=0
-pkgdesc="Secondary little kernel (lk) bootloader for msm8953 based devices"
-arch="aarch64"
-url="https://github.com/msm8953-mainline/lk2nd"
-license="MIT AND GPL-2.0-only"
-makedepends="dtc dtc-dev gcc-arm-none-eabi python3 py3-libfdt"
-builddir="$srcdir"/lk2nd-$pkgver
-subpackages="$pkgname-motorola-ali:motorola_ali"
-source="
-	lk2nd-$pkgver.tar.gz::https://github.com/msm8953-mainline/lk2nd/archive/refs/tags/$pkgver.tar.gz
-	o2.patch
-"
-options="!check !archcheck !tracedeps !strip pmb:cross-native"
-# This APKBUILD builds bare metal executable; options are very specific!
-# * there are no tests (how do you even test the bootloader?);
-# * binaries are "arch-independent"; aarch64 build also produces armv7 binary,
-#   because ARM CPUs boot in 32-bit mode;
-# * there are no depends for bootloader, it's a kernel and OS in one binary;
-# * stripping of unused sections is done in lk2nd's own ld script.
-
-_build() {
-	# This builds baremetal executable; distro-specific compiler flags
-	#   and optimizations can't be set by build system.
-	unset CFLAGS
-	unset CXXFLAGS
-	unset CPPFLAGS
-	unset LDFLAGS
-	unset CROSS_COMPILE
-	unset CC
-	unset CXX
-
-	# ccache and crossdirect "gcc"s are in PATH, get rid of them too,
-	#    redefine PATH to be bare minimum
-	unset PATH
-	export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-	local project="$1"; shift
-	make TOOLCHAIN_PREFIX=arm-none-eabi- "$@" "$project"
-}
-
-build() {
-	_build msm8953-secondary
-	_build motorola-ali-secondary
-}
-
-package() {
-	# main package is empty
-	install -Dm644 "$builddir"/build-msm8953-secondary/lk2nd.img -t \
-		"$pkgdir"/boot
-}
-
-motorola_ali() {
-	install -Dm644 "$builddir"/build-motorola-ali-secondary/lk2nd.img -t \
-		"$subpkgdir"/boot
-}
-
-sha512sums="
-ee0c48094d35cf18a0d9bc7f8eb36d503e43b86a9814ff74eb2bdddcd3493393045c89d98c513d7362b7666de8b8684616455d3a8532a9bb6ecbf64ab43dc5b8  lk2nd-0.3.9.tar.gz
-e4d2e116966485aca746bec5bf6ab9855514dc70dfb94ce3cdc9def01c5b36eeddc33e77bdbcfb8f6bb89bb0277fd6dd3e6f8066475dcfc5b5fcdec567af754b  o2.patch
-"

main/lk2nd-msm8953/o2.patch

@@ -1,13 +0,0 @@
-diff --git a/makefile b/makefile
-index 437f7bcb0..51b060c9c 100644
---- a/makefile
-+++ b/makefile
-@@ -53,7 +53,7 @@ ifeq ($(ENABLE_TRUSTZONE),1)
- endif
- 
- INCLUDES := -I$(BUILDDIR) -Iinclude
--CFLAGS := -O2 -g -fno-builtin -finline -Wno-multichar -Wno-unused-parameter -Wno-unused-function $(LKLE_CFLAGS) -include $(CONFIGHEADER)
-+CFLAGS := -O1 -g -fno-builtin -finline -Wno-multichar -Wno-unused-parameter -Wno-unused-function $(LKLE_CFLAGS) -include $(CONFIGHEADER)
- # -fcommon is needed to build this using GCC 10
- CFLAGS += -fcommon
- #CFLAGS += -Werror

main/lk2nd/APKBUILD

@@ -1,15 +1,22 @@
 # 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
 	"
 options="!check !archcheck !tracedeps !strip pmb:cross-native"
 # This APKBUILD builds bare metal executable; options are very specific!
@@ -21,17 +28,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-lge-hammerhead:msm8974_lge_hammerhead
 	"
 fi
 
@@ -58,8 +67,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" = "armv7" ]; then
 		_build lk2nd-msm8974
+		# NOTE: This is workaround for Nexus 5 (hammerhead) it should be removed when upstream fixes it
+		_build lk2nd-msm8974 BOOTLOADER_OUT=lge-hammerhead LK2ND_DTBS="" LK2ND_ADTBS="msm8974-lge-hammerhead.dtb"
 		_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_lge_hammerhead() {
+	install -Dm644 "$builddir"/lge-hammerhead/build-lk2nd-msm8974/lk2nd.img -t \
+		"$subpkgdir"/boot
 }
 
 msm8226() {
@@ -95,17 +125,11 @@ 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
 "