From 8e45b27c2caa0a0e5f26aca310fc8454ce346c2f Mon Sep 17 00:00:00 2001
From: Andrei Zisu <matzipan@gmail.com>
Date: Wed, 23 Jul 2025 23:51:59 +0200
Subject: [PATCH] device-mnt-reform2-bpi-cm4: load rtw88 firmware

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6820
---
 .../device-mnt-reform2-bpi-cm4/APKBUILD       |  2 +-
 .../linux-postmarketos-amlogic/APKBUILD       |  4 ++--
 .../config-postmarketos-amlogic.aarch64       | 20 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/device/testing/device-mnt-reform2-bpi-cm4/APKBUILD b/device/testing/device-mnt-reform2-bpi-cm4/APKBUILD
index 7ec6c6c55..2353b5517 100644
--- a/device/testing/device-mnt-reform2-bpi-cm4/APKBUILD
+++ b/device/testing/device-mnt-reform2-bpi-cm4/APKBUILD
@@ -23,7 +23,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="vdec firmware"
-	depends="linux-firmware-meson"
+	depends="linux-firmware-meson linux-firmware-rtw88"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/linux-postmarketos-amlogic/APKBUILD b/device/testing/linux-postmarketos-amlogic/APKBUILD
index 79e8c49f5..8b4fd5bb8 100644
--- a/device/testing/linux-postmarketos-amlogic/APKBUILD
+++ b/device/testing/linux-postmarketos-amlogic/APKBUILD
@@ -4,7 +4,7 @@
 # Co-Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=linux-postmarketos-amlogic
 pkgver=6.12.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Mainline kernel for Amlogic devices"
 arch="aarch64"
 _carch="arm64"
@@ -84,7 +84,7 @@ package() {
 
 sha512sums="
 c972c81f985c5470d4c1b4642214f9ddcb49cecbf1e6a99e52a24ce480d06d7ee7ca7f0dcee7bc4fe00da2f41f0bec4fcd569b6034522845ba5f0ad9ea0e1958  linux-postmarketos-amlogic-6.12.23.tar.xz
-8d01b1566db1380f46abf4fc7d9f3a41d91fafee284dbaa52aa7e1deb8f436d341a0965e41cd8089d698c7cb2c4aba7b64032dcb88929c4a56171ca4fe09c2ec  config-postmarketos-amlogic.aarch64
+1564a93e94fddaa06531898ac154d25f0c2ce90dc1c7a6fa14060724b488976e6764593df3efb644659e0f6d7882880231b8972ef484c781f3168413a848bde9  config-postmarketos-amlogic.aarch64
 4538994c7d3bbb0c4740e8ce108b6838618be239a549e407ca239f3ceca8eed29b5a9ca75d162567dbc06b13ac7caacc61ebf55b247ce6fe122fecc7e5b275d5  0001-add-x96-mini-support.patch
 222e7c12dbeb931f325b7d4a306c2f1e835992b5503ba3ab387a0b006e0fb2226291d93f32aec8ac7b2f6cf15704f20ef3285bb9bafe7374b11a034639d786ef  0002-add-initial-support-for-zte-b860hv5.patch
 74af031a66bab9c52e79d3099b506ad572a075d77e673b608d7ec32c8998c769171ced2d5c863118ff6d3757be2656e5a9adfb9455396dd855014cfdb9959b50  0003-arm64-dts-amlogic-Add-Ugoos-AM3.patch
diff --git a/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64 b/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64
index 77d7acf96..de2044a43 100644
--- a/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64
+++ b/device/testing/linux-postmarketos-amlogic/config-postmarketos-amlogic.aarch64
@@ -3133,7 +3133,25 @@ CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
 # CONFIG_RTL8192DU is not set
 # CONFIG_RTL8XXXU is not set
-# CONFIG_RTW88 is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_SDIO=m
+CONFIG_RTW88_8822C=m
+# CONFIG_RTW88_8822BE is not set
+# CONFIG_RTW88_8822BS is not set
+# CONFIG_RTW88_8822BU is not set
+# CONFIG_RTW88_8822CE is not set
+CONFIG_RTW88_8822CS=m
+# CONFIG_RTW88_8822CU is not set
+# CONFIG_RTW88_8723DE is not set
+# CONFIG_RTW88_8723DS is not set
+# CONFIG_RTW88_8723CS is not set
+# CONFIG_RTW88_8723DU is not set
+# CONFIG_RTW88_8821CE is not set
+# CONFIG_RTW88_8821CS is not set
+# CONFIG_RTW88_8821CU is not set
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 # CONFIG_RTW89 is not set
 CONFIG_WLAN_VENDOR_RSI=y
 # CONFIG_RSI_91X is not set