From e6c9934e908dfacce92f805c9c8ebaae03bb13fa Mon Sep 17 00:00:00 2001
From: Igor Belwon <igor.belwon@mentallysanemainliners.org>
Date: Mon, 29 Sep 2025 19:11:37 +0200
Subject: [PATCH] linux-postmarketos-mediatek-mt6878: upgrade to v6.17

Upgrade the kernel to version 6.17. While we're at it, regenerate the
config, and adapt the build process to booting via U-Boot.

Signed-off-by: Igor Belwon <igor.belwon@mentallysanemainliners.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7097>
---
 .../APKBUILD                                  | 21 +++++++------------
 ...onfig-postmarketos-mediatek-mt6878.aarch64 | 16 ++++++++++----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/device/testing/linux-postmarketos-mediatek-mt6878/APKBUILD b/device/testing/linux-postmarketos-mediatek-mt6878/APKBUILD
index 318049625..25d314ddd 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_rc5
+pkgver=6.17
 pkgrel=0
 pkgdesc="Mainline Kernel fork for MT6878 devices"
 arch="aarch64"
@@ -15,14 +15,13 @@ makedepends="
 	bison
 	devicepkg-dev
 	flex
-	lz4
 	openssl-dev
 	perl
 	python3
 "
 
 _repository="linux"
-_commit="fe8dbf4ceda497e791308668e7b906280ebc431b"
+_commit="b82e3a1c9d6c7a8e5f2ac3bb26b0b9f97e63b427"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/MT6878-mainline/$_repository/archive/$_commit.tar.gz
@@ -37,21 +36,15 @@ 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
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
 }
 
 package() {
 	mkdir -p "$pkgdir"/boot
 
-	install -Dm644 "$builddir/arch/$_carch/boot/Image.lz4" \
-		"$pkgdir/boot/vmlinuz"
+	install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \
+				   "$pkgdir/boot/vmlinuz"
 
 	make modules_install dtbs_install \
 		ARCH="$_carch" \
@@ -66,6 +59,6 @@ package() {
 }
 
 sha512sums="
-9837c059347719123439d7ee73cd585cd0822cfcfcfa73c679e53c400eb178be1ab33d32aca423ad2c99efb9a37701022cc593cabd565e18a8982f7bc2a390a5  linux-postmarketos-mediatek-mt6878-fe8dbf4ceda497e791308668e7b906280ebc431b.tar.gz
-0f772dce95060766142cc59cc99ecaa3f7ed2004fc9f9d06dd0fdbafdecbc1fe955a01810a65f3a7839cafc7620c8e5d5f5647c723ea2a79fe4d78cbeaef4c4d  config-postmarketos-mediatek-mt6878.aarch64
+72450ff264056b06eeda957e5eec495e43a50d6abdc630445d7207071b22df7b29a1ddb729b09e6090dfdf7f782b0b7e3e44875bde2315ad608fac4476d30d44  linux-postmarketos-mediatek-mt6878-b82e3a1c9d6c7a8e5f2ac3bb26b0b9f97e63b427.tar.gz
+681887f6157480371fad94d9aaf3530bf5924d26e9e0a845ed223de342b3dfc536224f69fa61fcab66c55178a8eeb2f149bf5c5e7dfa8e74dff49ec18ffa635f  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 3b57d3bea..53424324b 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-rc5 Kernel Configuration
+# Linux/arm64 6.17.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 15.2.0) 15.2.0"
 CONFIG_CC_IS_GCC=y
@@ -13,8 +13,6 @@ CONFIG_LD_VERSION=24500
 CONFIG_LLD_VERSION=0
 CONFIG_RUSTC_VERSION=0
 CONFIG_RUSTC_LLVM_VERSION=0
-CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
@@ -1976,7 +1974,6 @@ CONFIG_MTD_SST25L=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_INTEL_DG is not set
 
 #
 # Disk-On-Chip Device Drivers
@@ -5387,6 +5384,7 @@ CONFIG_HID_TWINHAN=y
 CONFIG_HID_KENSINGTON=y
 CONFIG_HID_LCPOWER=y
 CONFIG_HID_LED=y
+# CONFIG_HID_LENOVO is not set
 CONFIG_HID_LETSKETCH=y
 CONFIG_HID_LOGITECH=y
 CONFIG_HID_LOGITECH_DJ=y
@@ -6275,6 +6273,16 @@ CONFIG_COMMON_CLK_MT6878=y
 # CONFIG_COMMON_CLK_MT8188 is not set
 # CONFIG_COMMON_CLK_MT8192 is not set
 # CONFIG_COMMON_CLK_MT8195 is not set
+CONFIG_COMMON_CLK_MT8196=y
+CONFIG_COMMON_CLK_MT8196_IMP_IIC_WRAP=y
+CONFIG_COMMON_CLK_MT8196_MCUSYS=y
+CONFIG_COMMON_CLK_MT8196_MDPSYS=y
+CONFIG_COMMON_CLK_MT8196_MFGCFG=m
+CONFIG_COMMON_CLK_MT8196_MMSYS=m
+CONFIG_COMMON_CLK_MT8196_PEXTPSYS=y
+CONFIG_COMMON_CLK_MT8196_UFSSYS=y
+CONFIG_COMMON_CLK_MT8196_VDECSYS=m
+CONFIG_COMMON_CLK_MT8196_VENCSYS=m
 # CONFIG_COMMON_CLK_MT8365 is not set
 # CONFIG_COMMON_CLK_MT8516 is not set
 # end of Clock driver for MediaTek SoC