From 080500fffdf0d45c50d26eb6656d248e065ec9b9 Mon Sep 17 00:00:00 2001
From: Clayton Craft <craftyguy@postmarketos.org>
Date: Sun, 25 Jan 2026 08:59:44 -0800
Subject: [PATCH] linux-postmarketos-asahi: upgrade to 6.18.7-1

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7839>
---
 device/testing/linux-postmarketos-asahi/APKBUILD          | 8 ++++----
 .../config-postmarketos-asahi.aarch64                     | 2 +-
 device/testing/linux-postmarketos-asahi/misc.config       | 3 ---
 device/testing/linux-postmarketos-asahi/pmos.config       | 4 ++++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/device/testing/linux-postmarketos-asahi/APKBUILD b/device/testing/linux-postmarketos-asahi/APKBUILD
index b93b6dc10..b22e4e0bb 100644
--- a/device/testing/linux-postmarketos-asahi/APKBUILD
+++ b/device/testing/linux-postmarketos-asahi/APKBUILD
@@ -1,7 +1,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=linux-postmarketos-asahi
-pkgver=6.18.6_p1
-pkgrel=1
+pkgver=6.18.7_p1
+pkgrel=0
 _rel=${pkgver#*_p}
 _kver=${pkgver%_p*}
 _kver=${_kver//_/-}
@@ -88,7 +88,7 @@ package() {
 }
 
 sha512sums="
-0822974e8955bfd8b1b5d11f2cd2652c61868d46a6fff033f5d2556b64325ad646585fa6107e501d360a845df3bb498c57c28aeb95bf6b30ebec8376b7c545d1  linux-postmarketos-asahi-6.18.6-1.tar.gz
-cfe2cbcb13f62c1bfb9b0eaa310ef57034160ea7e7ff4bed9b4b2569a54c7f649608dde36770de965eff7cee4d9d388520f78f900c0d7419385fca1addb5e762  config-postmarketos-asahi.aarch64
+10fbae8b9481a544141d5a3e478e99722e9460396d72f5b5f44b2de84dcd3b66b6f09aebb923a95285f5cbc5f51922a40f0c19191d9b140cb554d137c3c5c0a9  linux-postmarketos-asahi-6.18.7-1.tar.gz
+74df4b7ffce6a74271fcfd69f22f780412f1c5a171bcd652332026edc5c946004dce3ae27ba9b7677cd78ec89dc72a2c3ec553247b6cf55dd6056ae8cad08f0c  config-postmarketos-asahi.aarch64
 8d205300cfabe192b53ed1cc644b087e76421eb973e1b2a31d657e4f2676badebdfcf6b0865569c43b4b904935435f6e729c3a8d4a6221fb5792e40ec1017a0f  0001-nvmem-apple-spmi-nvmem-Fix-CFI-failures.patch
 "
diff --git a/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64 b/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64
index e2cbb53df..81d94e47d 100644
--- a/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64
+++ b/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.18.6 Kernel Configuration
+# Linux/arm64 6.18.7 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.8"
 CONFIG_GCC_VERSION=0
diff --git a/device/testing/linux-postmarketos-asahi/misc.config b/device/testing/linux-postmarketos-asahi/misc.config
index ae5b4467d..80db59279 100644
--- a/device/testing/linux-postmarketos-asahi/misc.config
+++ b/device/testing/linux-postmarketos-asahi/misc.config
@@ -6,9 +6,6 @@ CONFIG_PROC_EVENTS=y
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CH341=m
 CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_MODULE_COMPRESS=y
-CONFIG_MODULE_COMPRESS_ZSTD=y
-CONFIG_MODULE_COMPRESS_ALL=y
 
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
diff --git a/device/testing/linux-postmarketos-asahi/pmos.config b/device/testing/linux-postmarketos-asahi/pmos.config
index 8478681a6..82eed9a0a 100644
--- a/device/testing/linux-postmarketos-asahi/pmos.config
+++ b/device/testing/linux-postmarketos-asahi/pmos.config
@@ -7,6 +7,8 @@ CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_XTS=y
 CONFIG_DEVTMPFS=y
 CONFIG_DM_CRYPT=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_FB=y
 CONFIG_INPUT_EVDEV=m
 # CONFIG_KINETO_GAN is not set
 # CONFIG_PFT is not set
@@ -21,6 +23,8 @@ CONFIG_BINFMT_SCRIPT=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_USER_NS=y
 CONFIG_NULL_TTY=m
+CONFIG_MODULE_COMPRESS=y
+CONFIG_MODULE_COMPRESS_ZSTD=y
 CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 CONFIG_PSI=y