From 98892eec6be500feba6eaa8933731a801ab6c99f Mon Sep 17 00:00:00 2001
From: mia26MAjFm <mia26MAjFm@users.noreply.github.com>
Date: Tue, 23 Jun 2026 16:07:45 -0400
Subject: [PATCH] fedora: drop duplicate in-image mwifiex build, use
 rpm-shipped modules

The kernel rpm built by kernel-builder/build.sh now ships mlan.ko / moal.ko
plus modprobe options for the PS5 IW620, so the image side no longer needs
its own out-of-tree build (which was pinned to an old ps5-linux-mwifiex
ref and only applied 1 of 3 patches, breaking against kernel 7.1.x).

Suppress the rpm's modules-load.d autoload so firmware-copy still runs
first via ps5-iw620.service.
---
 distros/fedora/image.yaml | 42 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/distros/fedora/image.yaml b/distros/fedora/image.yaml
index 3c56b9c..8a9c70e 100644
--- a/distros/fedora/image.yaml
+++ b/distros/fedora/image.yaml
@@ -68,16 +68,6 @@ packages:
     - wireless-regdb
     - util-linux
 
-    # Toolchain for the out-of-tree PS5 IW620 WiFi module build
-    - gcc
-    - make
-    - git-core
-    - bc
-    - bison
-    - flex
-    - elfutils-libelf-devel
-    - openssl-devel
-
     # System
     - glibc-langpack-en
     - openssh-server
@@ -233,29 +223,18 @@ actions:
     KVER=$(ls -1t /lib/modules | head -1)
     [ -f "/boot/efi/bzImage" ] && [ -f "/boot/efi/initrd.img" ]
 
-    # --- PS5 internal WiFi: build the PS5-patched NXP IW620 mwifiex modules ---
-    IW620_SRC=/tmp/ps5-iw620-mwifiex
-    IW620_PATCHES=/tmp/ps5-linux-mwifiex
-    IW620_NXP_REF=a5fe4e194bf99315e349d81d77d6dfacec70757a
-    IW620_PATCH_REF=5cfd063449f27e2f8a7d17c814a3bb21c27aa903
-    rm -rf "$IW620_SRC" "$IW620_PATCHES"
-    git clone https://github.com/nxp-imx/mwifiex.git "$IW620_SRC"
-    git -C "$IW620_SRC" checkout "$IW620_NXP_REF"
-    git clone https://github.com/ps5-linux/ps5-linux-mwifiex.git "$IW620_PATCHES"
-    git -C "$IW620_PATCHES" checkout "$IW620_PATCH_REF"
-    git -C "$IW620_SRC" apply "$IW620_PATCHES/ps5-iw620.patch"
-    make -C "$IW620_SRC" CONFIG_OBJTOOL= KERNELDIR="/usr/lib/modules/$KVER/build" ARCH=x86 -j"$(nproc)"
-    test -f "$IW620_SRC/mlan.ko"
-    test -f "$IW620_SRC/moal.ko"
-    install -d "/usr/lib/modules/$KVER/extra/ps5-iw620"
-    install -m 0644 "$IW620_SRC/mlan.ko" "/usr/lib/modules/$KVER/extra/ps5-iw620/mlan.ko"
-    install -m 0644 "$IW620_SRC/moal.ko" "/usr/lib/modules/$KVER/extra/ps5-iw620/moal.ko"
-    install -d /etc/modprobe.d /usr/local/sbin /etc/systemd/system /usr/share/doc/ps5-iw620
-    cat > /etc/modprobe.d/ps5-iw620.conf <<'EOF'
+    # --- PS5 internal WiFi: firmware-stage + autoload service ---
+    # The mlan.ko/moal.ko modules and their modprobe.d options are already
+    # shipped by linux-ps5.rpm (built by kernel-builder/build.sh, which now
+    # applies all PS5 mwifiex patches in one place). The rpm ALSO ships
+    # /etc/modules-load.d/moal which would auto-load moal at boot before
+    # firmware has been copied from /boot/efi — kill that and let our
+    # ps5-iw620.service do the copy+load in the right order.
+    rm -f /etc/modules-load.d/moal
+    install -d /usr/local/sbin /etc/systemd/system /etc/modprobe.d /usr/share/doc/ps5-iw620
+    cat > /etc/modprobe.d/ps5-iw620-noautoload.conf <<'EOF'
     blacklist moal
     blacklist mlan
-    softdep moal pre: cfg80211 mlan
-    options moal fw_name=nxp/pcieuartiw620_combo_v1.bin pcie_int_mode=1 drv_mode=1 cfg80211_wext=4 sta_name=mlan ext_scan=0 auto_fw_reload=0 wifi_reset_config=0 sched_scan=0 ps_mode=2 auto_ds=2 amsdu_disable=1
     EOF
     cat > /usr/local/sbin/ps5-iw620-load <<'EOF'
     #!/bin/sh
@@ -294,4 +273,3 @@ actions:
     EOF
     depmod -a "$KVER"
     systemctl enable ps5-iw620.service
-    rm -rf "$IW620_SRC" "$IW620_PATCHES"