From 9b2e0d4e5e2694ca3de1ac554472eafb9ba92c59 Mon Sep 17 00:00:00 2001
From: Igor Belwon <igor.belwon@mentallysanemainliners.org>
Date: Mon, 8 Sep 2025 14:36:18 +0200
Subject: [PATCH] linux-postmarketos-mediatek-mt6878: upgrade to 6.17-rc5

This kernel upgrade BREAKS booting with uniLoader and now requires lplk
to boot. The change is documented on the Wiki.

While we're at it, enable simpledrm.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7018>
---
 .../APKBUILD                                   | 18 ++++++++++++------
 ...config-postmarketos-mediatek-mt6878.aarch64 |  9 +++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/device/testing/linux-postmarketos-mediatek-mt6878/APKBUILD b/device/testing/linux-postmarketos-mediatek-mt6878/APKBUILD
index ee76291bb..318049625 100644
--- a/device/testing/linux-postmarketos-mediatek-mt6878/APKBUILD
+++ b/device/testing/linux-postmarketos-mediatek-mt6878/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: BotchedRPR <igor.belwon@mentallysanemainliners.org>
 pkgname=linux-postmarketos-mediatek-mt6878
-pkgver=6.17_rc4
+pkgver=6.17_rc5
 pkgrel=0
 pkgdesc="Mainline Kernel fork for MT6878 devices"
 arch="aarch64"
@@ -15,13 +15,14 @@ makedepends="
 	bison
 	devicepkg-dev
 	flex
+	lz4
 	openssl-dev
 	perl
 	python3
 "
 
 _repository="linux"
-_commit="eb7644312c31ce93a72dd8065be6c994c8fe7261"
+_commit="fe8dbf4ceda497e791308668e7b906280ebc431b"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/MT6878-mainline/$_repository/archive/$_commit.tar.gz
@@ -36,15 +37,20 @@ prepare() {
 
 build() {
 	unset LDFLAGS
+
+	# first, build the image, dtbs and modules - regular build flow
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-$_flavor"
+
+	# lk needs lz4 compression to boot - so build a lz4-compressed image
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-$_flavor" Image.lz4
 }
 
 package() {
 	mkdir -p "$pkgdir"/boot
 
-	# We need an uncompressed kernel image for including in uniLoader.
-	install -Dm644 "$builddir/arch/$_carch/boot/Image" \
+	install -Dm644 "$builddir/arch/$_carch/boot/Image.lz4" \
 		"$pkgdir/boot/vmlinuz"
 
 	make modules_install dtbs_install \
@@ -60,6 +66,6 @@ package() {
 }
 
 sha512sums="
-c2aca5b13772a6c1fb42b45a25ccf9557eb2e75cf51d8cf132d63b29043e026b8d6ed796895d217a51680ecc3915936cbb3bbc4f5bcd7d41b583af148ea5b02f  linux-postmarketos-mediatek-mt6878-eb7644312c31ce93a72dd8065be6c994c8fe7261.tar.gz
-75e970987140c5a700041cbdc094c7a6319cd48566d1c8e5654996261d1364ef2fe6bcf63f3527e6ca2b4e8bb4968835e0472330f62b1ed5815aa5b7ba2219c5  config-postmarketos-mediatek-mt6878.aarch64
+9837c059347719123439d7ee73cd585cd0822cfcfcfa73c679e53c400eb178be1ab33d32aca423ad2c99efb9a37701022cc593cabd565e18a8982f7bc2a390a5  linux-postmarketos-mediatek-mt6878-fe8dbf4ceda497e791308668e7b906280ebc431b.tar.gz
+0f772dce95060766142cc59cc99ecaa3f7ed2004fc9f9d06dd0fdbafdecbc1fe955a01810a65f3a7839cafc7620c8e5d5f5647c723ea2a79fe4d78cbeaef4c4d  config-postmarketos-mediatek-mt6878.aarch64
 "
diff --git a/device/testing/linux-postmarketos-mediatek-mt6878/config-postmarketos-mediatek-mt6878.aarch64 b/device/testing/linux-postmarketos-mediatek-mt6878/config-postmarketos-mediatek-mt6878.aarch64
index 987db1889..3b57d3bea 100644
--- a/device/testing/linux-postmarketos-mediatek-mt6878/config-postmarketos-mediatek-mt6878.aarch64
+++ b/device/testing/linux-postmarketos-mediatek-mt6878/config-postmarketos-mediatek-mt6878.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.17.0-rc4 Kernel Configuration
+# Linux/arm64 6.17.0-rc5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 15.2.0) 15.2.0"
 CONFIG_CC_IS_GCC=y
@@ -3321,8 +3321,8 @@ CONFIG_PINCTRL_MT6878=y
 #
 # end of Renesas pinctrl drivers
 
-CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_LEGACY=y
+CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -4354,6 +4354,7 @@ CONFIG_MEDIA_TUNER_XC5000=y
 #
 # Graphics support
 #
+CONFIG_APERTURE_HELPERS=y
 CONFIG_VIDEO=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_DRM=y
@@ -4402,7 +4403,8 @@ CONFIG_DRM_SCHED=y
 #
 # Drivers for system framebuffers
 #
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SYSFB_HELPER=y
+CONFIG_DRM_SIMPLEDRM=y
 # end of Drivers for system framebuffers
 
 #
@@ -4666,7 +4668,6 @@ CONFIG_FB=y
 CONFIG_XEN_FBDEV_FRONTEND=y
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
-# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
 CONFIG_FB_CORE=y