diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index ae0387c..c5eccf6 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -73,33 +73,21 @@ jobs:
           fi
           apk add -q curl
           found=0
-          publish() {
-            case "$(basename "$1")" in
-              imsd-*|fingerprintd-*) echo "registry-sourced, not republished: $(basename "$1")"; return 0 ;;
-              libqmi-*|qmi-utils-*) echo "retired fork, not republished: $(basename "$1")"; return 0 ;;
+          for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/*.apk; do
+            [ -e "$f" ] || continue
+            case "$(basename "$f")" in
+              imsd-*|fingerprintd-*) echo "registry-sourced, not republished: $(basename "$f")"; continue ;;
+              libqmi-*|qmi-utils-*) echo "retired fork, not republished: $(basename "$f")"; continue ;;
             esac
             found=1
             code=$(curl -s -o /dev/null -w '%{http_code}' \
-              --user "catbot:$PACKAGE_TOKEN" --upload-file "$1" \
+              --user "catbot:$PACKAGE_TOKEN" --upload-file "$f" \
               "https://forgejo.catcrafts.net/api/packages/Catcrafts/alpine/edge/fp6")
             case "$code" in
-              201) echo "published: $(basename "$1")" ;;
-              409) echo "already published: $(basename "$1")" ;;
-              *)   echo "FAILED ($code): $(basename "$1")"; exit 1 ;;
+              201) echo "published: $(basename "$f")" ;;
+              409) echo "already published: $(basename "$f")" ;;
+              *)   echo "FAILED ($code): $(basename "$f")"; exit 1 ;;
             esac
-          }
-          # The kernel goes last: a publish that fails part-way (the first
-          # failed upload ends this step) must never leave the registry serving
-          # a kernel without the userspace its card name needs - the 7.3 kernel
-          # has its topology and UCM only in soc-fairphone-fp6-audio >= 5.
-          for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/*.apk; do
-            [ -e "$f" ] || continue
-            case "$(basename "$f")" in linux-postmarketos-qcom-milos-*) continue ;; esac
-            publish "$f"
-          done
-          for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/linux-postmarketos-qcom-milos-*.apk; do
-            [ -e "$f" ] || continue
-            publish "$f"
           done
           [ "$found" = 1 ] || { echo "no packages found to publish"; exit 1; }
 
diff --git a/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest b/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest
deleted file mode 100644
index 0e4be6d..0000000
--- a/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-# WCN6750 WLAN board data (calibration, Qualcomm/Fairphone) - taken from the
-# stock modem partition on-device instead of being shipped (fp6 repo
-# journal/base/ 2026-10-14, journal/blobs/). The device tree asks ath11k for
-# the Fairphone_Gen_6 entry; upstream linux-firmware's board-2.bin has none,
-# the driver silently falls back to generic data, and on that the FP6 Plus
-# does not associate at all (user report 2026-10-14) while the FP6's scans
-# no longer find the 5 GHz networks around it, so it associates on 2.4 GHz
-# only (dev phone A/B 2026-11-01). The container built here is upstream's
-# file with every entry kept plus the device's own bdwlan.elf under the
-# requested name; it lives in /lib/firmware/updates, which the loader
-# searches first. Active slot first, the other slot as fallback; no hash pin
-# - the ELF belongs to the stock modem image and can change with it. No
-# rebind line: the service runs before the driver loads, so a fresh install
-# has the container at the first probe and an installed phone gets it at
-# its next boot - a re-probe from a package hook would restart wifi in the
-# middle of an upgrade.
-ath11k-bdf modem_a,modem_b image/qca6750/bdwlan.elf bus=ahb,qmi-chip-id=1,qmi-board-id=255,variant=Fairphone_Gen_6 /usr/lib/firmware/ath11k/WCN6750/hw1.0/board-2.bin.zst /usr/lib/firmware/updates/ath11k/WCN6750/hw1.0/board-2.bin
diff --git a/aports/device/fp6-vendor-blobs/APKBUILD b/aports/device/fp6-vendor-blobs/APKBUILD
index f73e7e2..b74bddc 100644
--- a/aports/device/fp6-vendor-blobs/APKBUILD
+++ b/aports/device/fp6-vendor-blobs/APKBUILD
@@ -12,33 +12,28 @@
 # drops a previously-shipped blob restores the file immediately instead of
 # at the next boot (--refresh in addition for an mbn consumer: it re-derives
 # the trustlet from the active slot even if a file is present). Consumers:
-# soc-fairphone-fp6-audio (aw88261 acf), fingerprintd (focal64 trustlet);
-# this package's own 30-ath11k-board-data fragment (WLAN board data).
+# soc-fairphone-fp6-audio (aw88261 acf), fingerprintd (focal64 trustlet).
 #
 # 1-r3 (2026-09-11): active slot first, an unpinned ('-') structurally
 # verified mode for mbn, --refresh -- after two field units got no
 # fingerprint sensor from a whole-image hash pin that can only match one
 # Android build (fp6 repo journal/blobs/, journal/fingerprint/).
-# 1-r4 (2026-10-14): the ath11k-bdf directive -- the WLAN board data the
-# device tree asks for, built on-device from the stock modem partition
-# (the FP6 Plus does not associate on upstream's generic data).
 maintainer="Jorijn van der Graaf <jorijnvdgraaf@catcrafts.net>"
 pkgname=fp6-vendor-blobs
 pkgver=1
-pkgrel=4
+pkgrel=3
 pkgdesc="On-device extraction of vendor blobs from the stock Android partitions"
 url="https://forgejo.catcrafts.net/Catcrafts/fp6-img"
 arch="noarch"
 license="GPL-3.0-only"
 # fallback mapper for when the initramfs didn't map the dynamic partitions
-depends="make-dynpart-mappings zstd"
+depends="make-dynpart-mappings"
 install="$pkgname.post-upgrade"
 options="!check"
 source="
 	fp6-vendor-blobs-extract
 	fp6-vendor-blobs.service
 	fp6-vendor-blobs.preset
-	30-ath11k-board-data.manifest
 "
 
 package() {
@@ -47,9 +42,8 @@ package() {
 	install -Dm644 "$srcdir"/fp6-vendor-blobs.service \
 		"$pkgdir"/usr/lib/systemd/system/fp6-vendor-blobs.service
 	# enabled unconditionally: the unit is a fast no-op once every manifest
-	# dest exists and every ath11k-bdf override is current against its base,
-	# and blobs appearing on first boot must not depend on a manual
-	# systemctl enable. sysinit = the real (pre-coldplug) run;
+	# dest exists, and blobs appearing on first boot must not depend on a
+	# manual systemctl enable. sysinit = the real (pre-coldplug) run;
 	# multi-user = the post-udev retry if the early run failed (see unit)
 	mkdir -p "$pkgdir"/etc/systemd/system/sysinit.target.wants \
 		"$pkgdir"/etc/systemd/system/multi-user.target.wants
@@ -64,13 +58,11 @@ package() {
 	# extracted, no sound card. See journal/blobs/ 2026-08-28.
 	install -Dm644 "$srcdir"/fp6-vendor-blobs.preset \
 		"$pkgdir"/usr/lib/systemd/system-preset/50-fp6-vendor-blobs.preset
-	install -Dm644 "$srcdir"/30-ath11k-board-data.manifest \
-		"$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d/30-ath11k-board-data.manifest
+	mkdir -p "$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d
 }
 
 sha512sums="
-6aee5f56bc7bc960537b7ca1069305b56a5ec8da99a58298ba1715e93f002d391a2bd24be78214428b0297f9e3cfd1003a243c76a2d08397dcac63a7d800d302  fp6-vendor-blobs-extract
+e9618b4a1ccbe0913a608b32a1a9e87337e3da79a3d7ccc7f49292ae9aaa9406d2ea9817d63b3cfff2c4346b80dd2476c10725f4f0f95c859acd17b22ec03a16  fp6-vendor-blobs-extract
 b4c290095d9f39515378dfef08de720ce49324210342aa13c131dfce1103785e796e6f821f0c659671a4c44b46f466ce0e03f11f216fdcdee2a99db5e7970800  fp6-vendor-blobs.service
 9e79dd0aed13f11a71282aa24b2a26331e85c105e25ab0c0fed6189b8c300769a5f4308b18b91d9855868d658ad3a57c03e26c9b11bd27fd5e03f9a5decbbd6a  fp6-vendor-blobs.preset
-f13d7b384a9b577762693c6831fbf28cb9e92e4f943af1917ddeba121c582f0c85c81a3e01e8e9ff6367c3717b6c37743f019db297f75339871292cf816bfc91  30-ath11k-board-data.manifest
 "
diff --git a/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract b/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract
index 650d7cc..7f5b940 100644
--- a/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract
+++ b/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract
@@ -11,7 +11,6 @@
 #
 #   file <partition[,partition...]> <path-in-partition> <dest> <sha256>
 #   mbn  <partition[,partition...]> <dir-in-partition> <name> <dest> <sha256|->
-#   ath11k-bdf <partition[,partition...]> <path-in-partition> <entry-name> <base> <dest>
 #   rebind <bus> <device>
 #
 # Partition lists are tried in the order written, except that on an A/B
@@ -48,24 +47,6 @@
 #   itself and refuses a damaged or foreign image (one flipped byte ->
 #   ERROR_ELF_SIGNATURE_ERROR, measured 2026-09-03). The sha256 of what was
 #   installed is logged either way.
-# ath11k-bdf: the WLAN board data (calibration) the device tree asks ath11k
-#   for by name, e.g. bus=ahb,qmi-chip-id=1,qmi-board-id=255,variant=Fairphone_Gen_6.
-#   Upstream linux-firmware's board-2.bin carries no Fairphone entry, so the
-#   driver silently falls back to the generic board-id data; the FP6 Plus does
-#   not associate on it (user report 2026-10-14, fp6 repo journal/base/). The
-#   stock modem partition has the device's own file (image/qca6750/bdwlan.elf).
-#   This directive copies it and wraps it into a container at <dest> (the
-#   loader searches /lib/firmware/updates first): <base> (board-2.bin or
-#   board-2.bin.zst, every upstream entry kept byte for byte) + one BOARD
-#   entry named <entry-name> holding the ELF. Verified structurally (ELF
-#   magic, sane size, the container's own magic), never by a pinned hash:
-#   the ELF belongs to the stock modem image and can change with it.
-#   The driver takes the first BOARD entry whose name matches, so an entry
-#   upstream ships under the same name is used before the appended copy.
-#   The sha256 of the <base> used is kept in <dest>.fp6-base: a <base> that
-#   changed since (a linux-firmware upgrade) rebuilds <dest> at the next
-#   run, and so does --refresh. A rebuild that reproduces the existing
-#   <dest> byte for byte installs nothing and does not count as extracted.
 # rebind: if this fragment's run extracted at least one file, unbind and
 #   re-probe <device> on <bus> so the consuming driver picks the file up
 #   in the same boot. Unconditional on purpose: a still-bound consumer may
@@ -83,9 +64,8 @@
 # --if-device: exit 0 quietly when no stock super partition is visible
 #   (apk post-install scripts run inside build/CI chroots too; on images
 #   built there the first-boot service does the real extraction).
-# --refresh: re-derive every mbn and ath11k-bdf dest even if it exists,
-#   replacing it only with an image that verifies (a failed refresh leaves
-#   the old file). For
+# --refresh: re-derive every mbn dest even if it exists, replacing it only
+#   with an image that verifies (a failed refresh leaves the old file). For
 #   the consumer's post-install/post-upgrade: a fresh 'apk add' gets its
 #   trustlet without a reboot, and a trustlet that was hand-placed or pinned
 #   to another build is replaced by the active slot's on the next upgrade.
@@ -277,76 +257,6 @@ extract_mbn() { # <partition,...> <dir-in-partition> <name> <dest> <sha256|->
 	fail "no listed partition ($parts) yields $rname with sha256 $want - $dest NOT installed$kept"
 }
 
-# One little-endian u32 as four raw bytes (busybox printf, octal escapes).
-le32() { # <value>
-	printf "\\$(printf %03o $(($1 & 255)))\\$(printf %03o $((($1 >> 8) & 255)))\\$(printf %03o $((($1 >> 16) & 255)))\\$(printf %03o $((($1 >> 24) & 255)))"
-}
-pad4() { # <length> -> bytes of zero padding to the next multiple of 4, on stdout
-	n=$(( (4 - $1 % 4) % 4 ))
-	[ "$n" -gt 0 ] && head -c "$n" /dev/zero
-	return 0
-}
-# <dest>.fp6-base records the sha256 of the <base> <dest> was built from.
-bdf_base_id() { sha256sum "$1" | awk '{print $1}'; }
-bdf_current() { # <base> <dest> - true when <dest> exists and was built from this <base>
-	[ -f "$1" ] && [ -e "$2" ] && [ -f "$2.fp6-base" ] || return 1
-	read -r bh bs < "$2.fp6-base"
-	[ "$bh" = "$(bdf_base_id "$1")" ]
-}
-extract_ath11k_bdf() { # <partition,...> <path-in-partition> <entry-name> <base> <dest>
-	parts=$1 bsrc=$2 bname=$3 bbase=$4 bdest=$5
-	[ -f "$bbase" ] || fail "ath11k-bdf: base container $bbase missing"
-	bid=$(bdf_base_id "$bbase")
-	braw="$bdest.fp6-raw.$$"
-	mkdir -p "${bdest%/*}" || fail "cannot create ${bdest%/*}"
-	case "$bbase" in
-	*.zst) zstd -dcq "$bbase" > "$braw" 2>/dev/null || { rm -f "$braw"; fail "ath11k-bdf: cannot decompress $bbase"; } ;;
-	*) cp "$bbase" "$braw" || { rm -f "$braw"; fail "ath11k-bdf: cannot read $bbase"; } ;;
-	esac
-	[ "$(head -c 16 "$braw")" = "QCA-ATH11K-BOARD" ] || { rm -f "$braw"; fail "ath11k-bdf: $bbase is not a QCA-ATH11K-BOARD container"; }
-	# the driver walks the entries 4-byte aligned; an entry appended to an
-	# unaligned base would be misread and the generic data used silently
-	bsz=$(fsize "$braw")
-	[ $(( bsz % 4 )) -eq 0 ] || { rm -f "$braw"; fail "ath11k-bdf: $bbase is $bsz bytes, not a multiple of 4"; }
-	for part in $(order_parts "$parts"); do
-		mount_part "$part" || { log "$part: not mountable, trying next"; continue; }
-		elf="$MNT/$bsrc"
-		[ -f "$elf" ] || { log "$part: no $bsrc, trying next"; continue; }
-		esz=$(fsize "$elf")
-		[ "$(hex4 "$elf")" = 7f454c46 ] || { log "$part:$bsrc: not an ELF image, trying next"; continue; }
-		[ "$esz" -ge 4096 ] && [ "$esz" -le $((1024 * 1024)) ] || { log "$part:$bsrc: $esz bytes is not a board data file, trying next"; continue; }
-		nlen=${#bname}
-		npad=$(( (nlen + 3) / 4 * 4 ))
-		dpad=$(( (esz + 3) / 4 * 4 ))
-		tmp="$bdest.fp6-extract.$$"
-		# container = base + BOARD IE { NAME IE, DATA IE }, each IE padded to 4
-		{
-			cat "$braw"
-			le32 0; le32 $((8 + npad + 8 + dpad))
-			le32 0; le32 "$nlen"; printf '%s' "$bname"; pad4 "$nlen"
-			le32 1; le32 "$esz"; cat "$elf"; pad4 "$esz"
-		} > "$tmp" 2>/dev/null || { rm -f "$tmp"; fail "ath11k-bdf: writing $tmp failed"; }
-		want=$(( $(fsize "$braw") + 8 + 8 + npad + 8 + dpad ))
-		tsz=$(fsize "$tmp")
-		[ "$tsz" -eq "$want" ] || { rm -f "$tmp" "$braw"; fail "ath11k-bdf: $tmp is $tsz bytes, expected $want"; }
-		got=$(sha256sum "$tmp" | awk '{print $1}')
-		if [ -e "$bdest" ] && [ "$(sha256sum "$bdest" | awk '{print $1}')" = "$got" ]; then
-			rm -f "$tmp" "$braw"
-			echo "$bid" > "$bdest.fp6-base" || fail "ath11k-bdf: cannot write $bdest.fp6-base"
-			log "ath11k-bdf: $bdest is already $bbase + $bname from $part:$bsrc (sha256 $got) - unchanged"
-			return 2
-		fi
-		chmod 644 "$tmp" && mv "$tmp" "$bdest" || { rm -f "$tmp" "$braw"; fail "installing $bdest failed"; }
-		echo "$bid" > "$bdest.fp6-base" || fail "ath11k-bdf: cannot write $bdest.fp6-base"
-		rm -f "$braw"
-		log "built $bdest = $bbase + $bname from $part:$bsrc ($esz bytes, sha256 $got)"
-		return 0
-	done
-	rm -f "$braw"
-	kept=
-	[ -e "$bdest" ] && kept=" (the existing file is left in place)"
-	fail "no listed partition ($parts) yields a well-formed $bsrc - $bdest NOT installed$kept"
-}
 extract() { # <partition,...> <path-in-partition> <dest> <sha256>
 	parts=$1 src=$2 dest=$3 want=$4
 	for part in $(order_parts "$parts"); do
@@ -402,8 +312,7 @@ fi
 
 [ -d "$MANIFEST_DIR" ] || exit 0
 
-# fast path for every boot after the first: every file/mbn dest present and
-# every ath11k-bdf dest current against its base (bdf_current)
+# fast path for every boot after the first: all dests already present
 missing=
 for f in "$MANIFEST_DIR"/*.manifest; do
 	[ -e "$f" ] || continue
@@ -411,7 +320,6 @@ for f in "$MANIFEST_DIR"/*.manifest; do
 		case "$kind" in
 		file) [ -e "$c" ] || missing=1 ;;
 		mbn)  [ -e "$d" ] && [ -z "$REFRESH" ] || missing=1 ;;
-		ath11k-bdf) [ -z "$REFRESH" ] && bdf_current "$d" "$e" || missing=1 ;;
 		esac
 	done < "$f"
 done
@@ -437,12 +345,6 @@ for f in "$MANIFEST_DIR"/*.manifest; do
 			extract_mbn "$a" "$b" "$c" "$d" "$e" </dev/null
 			extracted=1
 			;;
-		ath11k-bdf)
-			[ -n "$e" ] || fail "$f: malformed ath11k-bdf line"
-			[ -z "$REFRESH" ] && bdf_current "$d" "$e" && continue
-			extract_ath11k_bdf "$a" "$b" "$c" "$d" "$e" </dev/null
-			[ $? -eq 0 ] && extracted=1
-			;;
 		rebind)
 			[ -n "$b" ] || fail "$f: malformed rebind line"
 			rebinds="$rebinds $a/$b"
diff --git a/aports/device/linux-postmarketos-qcom-milos/0001-resolve_btfids-preserve-tag-and-parameter-names-when.patch b/aports/device/linux-postmarketos-qcom-milos/0001-resolve_btfids-preserve-tag-and-parameter-names-when.patch
new file mode 100644
index 0000000..01889a4
--- /dev/null
+++ b/aports/device/linux-postmarketos-qcom-milos/0001-resolve_btfids-preserve-tag-and-parameter-names-when.patch
@@ -0,0 +1,91 @@
+From d648a5fd7f95d961126605d59da5ad007c265bda Mon Sep 17 00:00:00 2001
+From: Aelin Reidel <aelin@mainlining.org>
+Date: Wed, 17 Jun 2026 00:38:17 +0200
+Subject: [PATCH] resolve_btfids: preserve tag and parameter names when
+ processing implicit args
+
+process_kfunc_with_implicit_args() obtains parameter names through
+btf__name_by_offset() and passes them to btf__add_func_param() while
+constructing a new function prototype. Tag names are processed in a
+similar fashion.
+
+The returned name pointer references memory owned by the BTF object.
+btf__add_func_param(), btf__add_decl_tag(), etc. modify the same BTF and
+may grow its internal storage, invalidating previously returned string
+pointers.
+
+This can result in btf__add_func_param(), btf__add_decl_tag(), etc.
+dereferencing a stale pointer when copying the string, leading to crashes
+in strset__add_str().
+
+Duplicate the parameter name before calling btf__add_func_param() so it
+remains valid across BTF updates.
+
+Fixes: 9d199965990c ("resolve_btfids: Support for KF_IMPLICIT_ARGS")
+Cc: stable@vger.kernel.org
+Signed-off-by: Aelin Reidel <aelin@mainlining.org>
+---
+ tools/bpf/resolve_btfids/main.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
+index f8a91fa7584f..94b89e9c942e 100644
+--- a/tools/bpf/resolve_btfids/main.c
++++ b/tools/bpf/resolve_btfids/main.c
+@@ -1113,6 +1113,7 @@ static int process_kfunc_with_implicit_args(struct btf2btf_context *ctx, struct
+ {
+ 	s32 idx, new_proto_id, new_func_id, proto_id;
+ 	const char *param_name, *tag_name;
++	char *tmp_param_name, *tmp_tag_name;
+ 	const struct btf_param *params;
+ 	enum btf_func_linkage linkage;
+ 	char tmp_name[KSYM_NAME_LEN];
+@@ -1163,18 +1164,22 @@ static int process_kfunc_with_implicit_args(struct btf2btf_context *ctx, struct
+ 		if (strcmp(tag_name, "bpf_kfunc") == 0)
+ 			continue;
+ 
++		tmp_tag_name = strdup(tag_name);
+ 		idx = btf_decl_tag(t)->component_idx;
+ 
+ 		if (btf_kflag(t))
+-			err = btf__add_decl_attr(btf, tag_name, new_func_id, idx);
++			err = btf__add_decl_attr(btf, tmp_tag_name, new_func_id, idx);
+ 		else
+-			err = btf__add_decl_tag(btf, tag_name, new_func_id, idx);
++			err = btf__add_decl_tag(btf, tmp_tag_name, new_func_id, idx);
+ 
+ 		if (err < 0) {
+ 			pr_err("ERROR: resolve_btfids: failed to add decl tag %s for %s\n",
+-			       tag_name, tmp_name);
++			       tmp_tag_name, tmp_name);
++			free(tmp_tag_name);
+ 			return -EINVAL;
+ 		}
++
++		free(tmp_tag_name);
+ 	}
+ 
+ add_new_proto:
+@@ -1193,12 +1198,17 @@ static int process_kfunc_with_implicit_args(struct btf2btf_context *ctx, struct
+ 		if (is_kf_implicit_arg(btf, &params[i]))
+ 			break;
+ 		param_name = btf__name_by_offset(btf, params[i].name_off);
+-		err = btf__add_func_param(btf, param_name, params[i].type);
++		tmp_param_name = strdup(param_name);
++		if (!tmp_param_name)
++			return -ENOMEM;
++		err = btf__add_func_param(btf, tmp_param_name, params[i].type);
+ 		if (err < 0) {
+ 			pr_err("ERROR: resolve_btfids: failed to add param %s for %s\n",
+-			       param_name, kfunc->name);
++			       tmp_param_name, kfunc->name);
++			free(tmp_param_name);
+ 			return err;
+ 		}
++		free(tmp_param_name);
+ 		t = (struct btf_type *)btf__type_by_id(btf, proto_id);
+ 	}
+ 
+-- 
+2.54.0
+
diff --git a/aports/device/linux-postmarketos-qcom-milos/APKBUILD b/aports/device/linux-postmarketos-qcom-milos/APKBUILD
index acfadb1..6e3c06f 100644
--- a/aports/device/linux-postmarketos-qcom-milos/APKBUILD
+++ b/aports/device/linux-postmarketos-qcom-milos/APKBUILD
@@ -1,15 +1,12 @@
-# Fork of pmaports device/testing/linux-postmarketos-qcom-milos (7.2.0-r0; pmaports
-# still ships 7.2.0), overlaid via pmbootstrap so it shadows the upstream aport.
-# Differences: source is the Catcrafts combined-stable branch (upstream
-# v7.3.0-milos tag + the FP6 bring-up carries); the config is the exact one
-# the development FP6 runs, plus CONFIG_EFI_ZBOOT for the packaging below;
-# build() targets the FP6's own cores (KCFLAGS); and the package depends on
-# soc-fairphone-fp6-audio >= 5, which carries the topology and UCM for the
-# card name the 7.3 DTS uses.
+# Fork of pmaports device/testing/linux-postmarketos-qcom-milos (7.2.0-r0),
+# overlaid via pmbootstrap so it shadows the upstream aport. Differences:
+# source is the Catcrafts combined-stable branch (upstream v7.2.0-milos tag +
+# the FP6 bring-up carries), and the config is the exact one the development
+# FP6 runs, plus CONFIG_EFI_ZBOOT for the packaging below.
 maintainer="Jorijn van der Graaf <jorijnvdgraaf@catcrafts.net>"
 _flavor="postmarketos-qcom-milos"
 pkgname=linux-$_flavor
-pkgver=7.3.0
+pkgver=7.2.0
 # always sorts above the upstream aport (r0..r99)
 pkgrel=103
 pkgdesc="Milos mainline kernel + Catcrafts FP6 bring-up carries (combined-stable)"
@@ -17,13 +14,6 @@ arch="aarch64"
 _carch="arm64"
 url="https://forgejo.catcrafts.net/Catcrafts/milos-linux"
 license="GPL-2.0-only"
-# The 7.3 DTS names the sound card MILOS-Fairphone-Gen6; only
-# soc-fairphone-fp6-audio >= 5 installs the topology and UCM under that
-# name. Without this bound a kernel-only upgrade boots with no sound card at
-# all: the topology load fails and the card does not instantiate.
-# A pkgver floor, not a pkgrel one: pmbootstrap resolves a versioned
-# dependency on an aport against its pkgver alone.
-depends="soc-fairphone-fp6-audio>=5"
 options="!strip !check !tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
@@ -55,6 +45,7 @@ _commit="REPLACED_BY_CI"
 
 source="
 	milos-linux-$_commit.tar.gz
+	0001-resolve_btfids-preserve-tag-and-parameter-names-when.patch
 	$_config
 "
 builddir="$srcdir/milos-linux"
@@ -101,5 +92,6 @@ package() {
 
 sha512sums="
 REPLACED_BY_CI  milos-linux-REPLACED_BY_CI.tar.gz
+4e705e038a91466a86fc5317b0028c2220aa1e7a4807e5d86db2f9ac815a927c59666a8f21ed50c4632147d3ce183d8042378a76f95341dbcd3db1047faf39e3  0001-resolve_btfids-preserve-tag-and-parameter-names-when.patch
 REPLACED_BY_CI  config-postmarketos-qcom-milos.aarch64
 "
diff --git a/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64 b/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64
index f331623..4ae9b46 100644
--- a/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64
+++ b/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64
@@ -1,16 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 7.3.0 Kernel Configuration
+# Linux/arm64 7.2.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="clang version 23.1.3"
+CONFIG_CC_VERSION_TEXT="clang version 22.1.8"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=230103
+CONFIG_CLANG_VERSION=220108
 CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=230103
+CONFIG_AS_VERSION=220108
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
-CONFIG_LLD_VERSION=230103
+CONFIG_LLD_VERSION=220108
 CONFIG_RUSTC_VERSION=0
 CONFIG_RUSTC_LLVM_VERSION=0
 CONFIG_RUSTC_LLVM_MAJOR_VERSION=0
@@ -25,9 +25,8 @@ CONFIG_CC_HAS_COUNTED_BY=y
 CONFIG_CC_HAS_COUNTED_BY_PTR=y
 CONFIG_CC_HAS_ALLOC_TOKEN=y
 CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y
-CONFIG_CC_OPT_INLINE_MEMSET="-mllvm -max-store-memset=4294967294"
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
-CONFIG_PAHOLE_VERSION=132
+CONFIG_PAHOLE_VERSION=131
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -120,7 +119,6 @@ CONFIG_ARCH_HAS_PREEMPT_LAZY=y
 CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_LAZY is not set
 CONFIG_PREEMPT_COUNT=y
-CONFIG_HAS_SEPARATE_PREEMPT_RESCHED_BITS=y
 CONFIG_PREEMPTION=y
 # CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_SCHED_CORE is not set
@@ -173,12 +171,11 @@ CONFIG_UCLAMP_TASK=y
 CONFIG_UCLAMP_BUCKETS_COUNT=5
 # end of Scheduler features
 
-CONFIG_ARCH_HAS_PTE_PROTNONE=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough"
-CONFIG_CC_MS_EXTENSIONS="-fms-anonymous-structs"
+CONFIG_CC_MS_EXTENSIONS="-fms-extensions"
 CONFIG_GCC10_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -242,6 +239,7 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
 CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
+CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYSFS_SYSCALL=y
@@ -409,7 +407,7 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
-CONFIG_ARM64_WORKAROUND_REPEAT_TLBI_SYNC=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
 CONFIG_ARM64_ERRATUM_2441007=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
@@ -422,10 +420,8 @@ CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2441009=y
-CONFIG_ARM64_WORKAROUND_BROKEN_AMU_CONSTCNT=y
 CONFIG_ARM64_ERRATUM_2457168=y
 CONFIG_ARM64_ERRATUM_2645198=y
-CONFIG_ARM64_ERRATUM_3821522=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
@@ -449,8 +445,6 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_ARM64_WORKAROUND_DISABLE_CNP=y
 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
-CONFIG_NVIDIA_OLYMPUS_1027_ERRATUM=y
-CONFIG_RENESAS_ERRATUM_GEN4GICITS1=y
 CONFIG_ROCKCHIP_ERRATUM_3568002=y
 CONFIG_ROCKCHIP_ERRATUM_3588001=y
 # CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
@@ -542,6 +536,7 @@ CONFIG_ARM64_TLB_RANGE=y
 #
 CONFIG_AS_HAS_ARMV8_5=y
 CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARM64_AS_HAS_MTE=y
@@ -919,7 +914,6 @@ CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
-# CONFIG_QUEUED_SPINLOCKS_TRACE_CONTENDED_RELEASE is not set
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
@@ -995,7 +989,7 @@ CONFIG_PAGE_REPORTING=y
 CONFIG_NUMA_MIGRATION=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-CONFIG_ARCH_HAS_PMD_SOFTLEAVES=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -1062,7 +1056,6 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_EXECMEM=y
 CONFIG_NUMA_MEMBLKS=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_GENERIC_ARCH_NUMA=y
 CONFIG_ARCH_HAS_USER_SHADOW_STACK=y
 CONFIG_PT_RECLAIM=y
 CONFIG_ARCH_HAS_LAZY_MMU_MODE=y
@@ -1730,7 +1723,9 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_ARCH_NUMA=y
 # CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
 # end of Generic Driver Options
 
@@ -1819,8 +1814,6 @@ CONFIG_ARM_PSCI_FW=y
 #
 # Qualcomm firmware drivers
 #
-CONFIG_QCOM_PAS=y
-CONFIG_QCOM_PAS_TEE=m
 CONFIG_QCOM_SCM=y
 CONFIG_QCOM_TZMEM=y
 CONFIG_QCOM_TZMEM_MODE_GENERIC=y
@@ -1918,6 +1911,7 @@ CONFIG_QCOM_FASTRPC=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 # CONFIG_XILINX_SDFEC is not set
+# CONFIG_HISI_HIKEY_USB is not set
 # CONFIG_OPEN_DICE is not set
 CONFIG_NTSYNC=m
 # CONFIG_VCPU_STALL_DETECTOR is not set
@@ -1927,9 +1921,14 @@ CONFIG_NTSYNC=m
 #
 # EEPROM support
 #
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# CONFIG_EEPROM_M24LR is not set
 # end of EEPROM support
 
 # CONFIG_SENSORS_LIS3_SPI is not set
@@ -1939,8 +1938,6 @@ CONFIG_NTSYNC=m
 # CONFIG_UACCE is not set
 # CONFIG_PVPANIC is not set
 # CONFIG_AMD_SBRMI_I2C is not set
-# CONFIG_AMD_SBTSI is not set
-# CONFIG_INTEL_SSEI is not set
 # end of Misc devices
 
 #
@@ -2093,7 +2090,6 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_ADI=y
 # CONFIG_ADIN1110 is not set
-# CONFIG_ADIN1140 is not set
 CONFIG_NET_VENDOR_LITEX=y
 # CONFIG_LITEX_LITEETH is not set
 CONFIG_NET_VENDOR_MARVELL=y
@@ -2153,7 +2149,6 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NET_VENDOR_XILINX=y
 # CONFIG_XILINX_EMACLITE is not set
 # CONFIG_XILINX_LL_TEMAC is not set
-CONFIG_NET_VENDOR_ZTE=y
 CONFIG_QCOM_IPA=m
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
@@ -2172,7 +2167,6 @@ CONFIG_FIXED_PHY=y
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
-# CONFIG_ADIN1140_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
 CONFIG_AX88796B_PHY=m
 # CONFIG_BROADCOM_PHY is not set
@@ -2182,7 +2176,6 @@ CONFIG_AX88796B_PHY=m
 # CONFIG_BCM87XX_PHY is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CORTINA_PHY is not set
-# CONFIG_DAP8211R_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_LXT_PHY is not set
@@ -2227,10 +2220,6 @@ CONFIG_AX88796B_PHY=m
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_PSE_CONTROLLER is not set
-
-#
-# MDIO controller drivers
-#
 CONFIG_FWNODE_MDIO=y
 CONFIG_OF_MDIO=y
 # CONFIG_MDIO_BITBANG is not set
@@ -2248,8 +2237,6 @@ CONFIG_OF_MDIO=y
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# end of MDIO Multiplexers
-# end of MDIO controller drivers
 
 #
 # PCS device drivers
@@ -2346,11 +2333,6 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
-CONFIG_WLAN_VENDOR_MORSEMICRO=y
-# CONFIG_MM81X_USB is not set
-# CONFIG_MM81X_SDIO is not set
-CONFIG_WLAN_VENDOR_NXP=y
-# CONFIG_NXPWIFI_SDIO is not set
 CONFIG_WLAN_VENDOR_PURELIFI=y
 # CONFIG_PLFXLC is not set
 CONFIG_WLAN_VENDOR_RALINK=y
@@ -2502,7 +2484,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_EGALAX is not set
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-CONFIG_TOUCHSCREEN_ESWIN_EPH8621=y
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
@@ -2588,7 +2569,6 @@ CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_IQS269A is not set
 # CONFIG_INPUT_IQS626A is not set
 # CONFIG_INPUT_IQS7222 is not set
-# CONFIG_INPUT_ISA1200_HAPTIC is not set
 # CONFIG_INPUT_CMA3000 is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
@@ -2713,7 +2693,6 @@ CONFIG_HW_RANDOM_OPTEE=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
-CONFIG_HW_RANDOM_QCOM=y
 # CONFIG_DEVMEM is not set
 CONFIG_DEVPORT=y
 # CONFIG_TCG_TPM is not set
@@ -2887,7 +2866,6 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_AW9523 is not set
 # CONFIG_PINCTRL_CY8C95X0 is not set
-# CONFIG_PINCTRL_GENERIC_MUX is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
@@ -2908,7 +2886,6 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ9574 is not set
 # CONFIG_PINCTRL_IPQ9650 is not set
 # CONFIG_PINCTRL_KAANAPALI is not set
-CONFIG_PINCTRL_MAILI=y
 # CONFIG_PINCTRL_MDM9607 is not set
 # CONFIG_PINCTRL_MSM8916 is not set
 # CONFIG_PINCTRL_MSM8917 is not set
@@ -3125,9 +3102,7 @@ CONFIG_BATTERY_QCOM_BATTMGR=y
 # CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_BQ25980 is not set
-# CONFIG_CHARGER_BQ25630 is not set
 # CONFIG_CHARGER_BQ256XX is not set
-# CONFIG_CHARGER_SGM41542 is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
@@ -3170,7 +3145,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
-# CONFIG_SENSORS_KB9002 is not set
 # CONFIG_SENSORS_ARCTIC_FAN_CONTROLLER is not set
 # CONFIG_SENSORS_ARM_SCMI is not set
 # CONFIG_SENSORS_ATXP1 is not set
@@ -3269,6 +3243,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
 # CONFIG_SENSORS_PT5161L is not set
+# CONFIG_SENSORS_SBTSI is not set
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SHT3x is not set
@@ -3868,8 +3843,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX355 is not set
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 is not set
-# CONFIG_VIDEO_IMX471 is not set
-# CONFIG_VIDEO_IMX678 is not set
 CONFIG_VIDEO_IMX896=m
 # CONFIG_VIDEO_MT9M001 is not set
 # CONFIG_VIDEO_MT9M111 is not set
@@ -4428,7 +4401,6 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
-# CONFIG_DRM_PANEL_ANBERNIC_TD4310 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set
@@ -4438,7 +4410,6 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_LL2 is not set
-# CONFIG_DRM_PANEL_CHIPONE_ICNA35XX is not set
 # CONFIG_DRM_PANEL_CHIPWEALTH_CH13726A is not set
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
@@ -4454,10 +4425,8 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_HIMAX_HX83121A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_HYDIS_HV101HD1 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI7807S is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9488 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9806E_DSI is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI is not set
@@ -4490,7 +4459,6 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT36536 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT37700F is not set
@@ -4509,7 +4477,6 @@ CONFIG_DRM_PANEL_NOVATEK_NT37705=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RENESAS_R61307 is not set
-# CONFIG_DRM_PANEL_RENESAS_R63419 is not set
 # CONFIG_DRM_PANEL_RENESAS_R69328 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
@@ -4648,7 +4615,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTD2801 is not set
 # CONFIG_BACKLIGHT_KTZ8866 is not set
-# CONFIG_BACKLIGHT_SY7758 is not set
 # CONFIG_BACKLIGHT_MAX25014 is not set
 CONFIG_BACKLIGHT_QCOM_WLED=y
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4936,8 +4902,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
-# CONFIG_SND_SOC_ADAU1977_SPI is not set
-# CONFIG_SND_SOC_ADAU1977_I2C is not set
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_ADAU7118_HW is not set
 # CONFIG_SND_SOC_ADAU7118_I2C is not set
@@ -5061,7 +5025,6 @@ CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_RT5640 is not set
 # CONFIG_SND_SOC_RT5645 is not set
 # CONFIG_SND_SOC_RT5659 is not set
-# CONFIG_SND_SOC_RT5677 is not set
 # CONFIG_SND_SOC_RT5682_SDW is not set
 # CONFIG_SND_SOC_RT700_SDW is not set
 # CONFIG_SND_SOC_RT711_SDW is not set
@@ -5161,7 +5124,6 @@ CONFIG_SND_SOC_WCD9378_SDW=m
 # CONFIG_SND_SOC_WSA881X is not set
 # CONFIG_SND_SOC_WSA883X is not set
 # CONFIG_SND_SOC_WSA884X is not set
-# CONFIG_SND_SOC_WSA885X is not set
 # CONFIG_SND_SOC_ZL38060 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
@@ -5241,13 +5203,11 @@ CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
-# CONFIG_HID_HYPERX is not set
 CONFIG_HID_VIVALDI_COMMON=m
 CONFIG_HID_GOODIX_SPI=m
 CONFIG_HID_GOOGLE_STADIA_FF=m
 CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
-# CONFIG_HID_MSI is not set
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 # CONFIG_HID_KYSONA is not set
@@ -5353,7 +5313,6 @@ CONFIG_HID_MCP2221=m
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support
 
 CONFIG_I2C_HID=y
@@ -5773,7 +5732,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
 # CONFIG_LEDS_SPI_BYTE is not set
 # CONFIG_LEDS_LM3697 is not set
 # CONFIG_LEDS_ST1202 is not set
-# CONFIG_LEDS_LTC3220 is not set
 
 #
 # Flash and Torch LED drivers
@@ -6073,21 +6031,13 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
-
-#
-# Cixtech Audio Subsystem Clock Driver
-#
-# end of Cixtech Audio Subsystem Clock Driver
-
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_CLK_ELIZA_DISPCC is not set
 # CONFIG_CLK_ELIZA_GCC is not set
 # CONFIG_CLK_ELIZA_TCSRCC is not set
-CONFIG_CLK_GLYMUR_CAMCC=m
 # CONFIG_CLK_GLYMUR_DISPCC is not set
-CONFIG_CLK_GLYMUR_EVACC=m
-CONFIG_CLK_GLYMUR_GCC=m
+# CONFIG_CLK_GLYMUR_GCC is not set
 # CONFIG_CLK_GLYMUR_GPUCC is not set
 # CONFIG_CLK_GLYMUR_TCSRCC is not set
 # CONFIG_CLK_GLYMUR_VIDEOCC is not set
@@ -6097,12 +6047,7 @@ CONFIG_CLK_GLYMUR_GCC=m
 # CONFIG_CLK_KAANAPALI_GPUCC is not set
 # CONFIG_CLK_KAANAPALI_TCSRCC is not set
 # CONFIG_CLK_KAANAPALI_VIDEOCC is not set
-CONFIG_CLK_NORD_DISPCC=m
-CONFIG_CLK_MAILI_VIDEOCC=m
-CONFIG_CLK_NORD_GCC=m
-CONFIG_CLK_SHIKRA_AUDIOCORECC=m
-CONFIG_CLK_SHIKRA_GCC=y
-CONFIG_CLK_NORD_GPUCC=m
+# CONFIG_CLK_NORD_GCC is not set
 # CONFIG_CLK_X1E80100_CAMCC is not set
 # CONFIG_CLK_X1E80100_DISPCC is not set
 # CONFIG_CLK_X1E80100_GCC is not set
@@ -6113,14 +6058,15 @@ CONFIG_CLK_NORD_GPUCC=m
 # CONFIG_CLK_X1P42100_VIDEOCC is not set
 # CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_QCOM_A53PLL is not set
+# CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCC_MSM8996 is not set
 CONFIG_QCOM_CLK_RPMH=y
-CONFIG_CLK_HAWI_GCC=m
+# CONFIG_CLK_HAWI_GCC is not set
 # CONFIG_CLK_HAWI_TCSRCC is not set
-CONFIG_CLK_HAWI_VIDEOCC=m
 # CONFIG_IPQ_APSS_PLL is not set
 # CONFIG_IPQ_APSS_5424 is not set
 # CONFIG_IPQ_CMN_PLL is not set
+# CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_IPQ_GCC_5018 is not set
 # CONFIG_IPQ_GCC_5210 is not set
 # CONFIG_IPQ_GCC_5332 is not set
@@ -6315,7 +6261,6 @@ CONFIG_QCOM_IOMMU=y
 #
 CONFIG_REMOTEPROC=y
 # CONFIG_REMOTEPROC_CDEV is not set
-# CONFIG_AMD_MBV_BRAM_REMOTEPROC is not set
 CONFIG_QCOM_PIL_INFO=m
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_Q6V5_COMMON=m
@@ -6386,15 +6331,23 @@ CONFIG_SOUNDWIRE_QCOM=y
 # end of Enable LiteX SoC Builder specific drivers
 
 # CONFIG_WPCM450_SOC is not set
-CONFIG_QCOM_SOC=y
+
+#
+# Qualcomm SoC drivers
+#
 CONFIG_QCOM_AOSS_QMP=y
 CONFIG_QCOM_COMMAND_DB=y
 CONFIG_QCOM_GENI_SE=y
+# CONFIG_QCOM_GSBI is not set
 CONFIG_QCOM_LLCC=y
+CONFIG_QCOM_MDT_LOADER=y
 # CONFIG_QCOM_OCMEM is not set
 CONFIG_QCOM_PD_MAPPER=y
+CONFIG_QCOM_PDR_HELPERS=y
+CONFIG_QCOM_PDR_MSG=y
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 CONFIG_QCOM_PMIC_GLINK=y
+CONFIG_QCOM_QMI_HELPERS=y
 # CONFIG_QCOM_RAMP_CTRL is not set
 CONFIG_QCOM_RMTFS_MEM=y
 # CONFIG_QCOM_RPM_MASTER_STATS is not set
@@ -6410,12 +6363,10 @@ CONFIG_QCOM_STATS=y
 # CONFIG_QCOM_WCNSS_CTRL is not set
 CONFIG_QCOM_APR=y
 CONFIG_QCOM_ICC_BWMON=y
-# CONFIG_QCOM_PBS is not set
 CONFIG_QCOM_INLINE_CRYPTO_ENGINE=y
-CONFIG_QCOM_MDT_LOADER=y
-CONFIG_QCOM_PDR_HELPERS=y
-CONFIG_QCOM_PDR_MSG=y
-CONFIG_QCOM_QMI_HELPERS=y
+# CONFIG_QCOM_PBS is not set
+# end of Qualcomm SoC drivers
+
 CONFIG_QCOM_UBWC_CONFIG=y
 # CONFIG_SOC_TI is not set
 
@@ -6642,7 +6593,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_TI_ADS1018 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1119 is not set
-# CONFIG_TI_ADS112C14 is not set
 # CONFIG_TI_ADS124S08 is not set
 # CONFIG_TI_ADS1298 is not set
 # CONFIG_TI_ADS131E08 is not set
@@ -6655,7 +6605,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_TI_LMP92064 is not set
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TI_TSC2046 is not set
-# CONFIG_VERSAL_SYSMON_I2C is not set
 # CONFIG_VF610_ADC is not set
 # CONFIG_XILINX_XADC is not set
 # end of Analog to digital converters
@@ -6779,7 +6728,6 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4728 is not set
-# CONFIG_MCP47A1 is not set
 # CONFIG_MCP47FEB02 is not set
 # CONFIG_MCP4821 is not set
 # CONFIG_MCP4922 is not set
@@ -6801,12 +6749,6 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
 # CONFIG_ADMV8818 is not set
 # end of Filters
 
-#
-# Flow sensors
-#
-# CONFIG_SENSIRION_SLF3S is not set
-# end of Flow sensors
-
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -6820,7 +6762,6 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
-# CONFIG_ADF41513 is not set
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADF4377 is not set
@@ -6901,8 +6842,6 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 CONFIG_INV_ICM42600=m
 # CONFIG_INV_ICM42600_I2C is not set
 CONFIG_INV_ICM42600_SPI=m
-# CONFIG_INV_ICM42607_I2C is not set
-# CONFIG_INV_ICM42607_SPI is not set
 # CONFIG_INV_ICM45600_I2C is not set
 # CONFIG_INV_ICM45600_SPI is not set
 # CONFIG_INV_MPU6050_I2C is not set
@@ -7000,7 +6939,6 @@ CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC5983 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
 # CONFIG_INFINEON_TLV493D is not set
-# CONFIG_QMC5883L is not set
 CONFIG_QMC6308=m
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
@@ -7268,11 +7206,6 @@ CONFIG_NVMEM_LAYOUTS=y
 # CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set
 # end of Layout Types
 
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_EE1004 is not set
-# CONFIG_EEPROM_M24LR is not set
 CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 # CONFIG_NVMEM_RMEM is not set
@@ -7304,7 +7237,6 @@ CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
 # CONFIG_INTERCONNECT_QCOM_GLYMUR is not set
 # CONFIG_INTERCONNECT_QCOM_HAWI is not set
 # CONFIG_INTERCONNECT_QCOM_KAANAPALI is not set
-CONFIG_INTERCONNECT_QCOM_MAILI=y
 # CONFIG_INTERCONNECT_QCOM_NORD is not set
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
 # CONFIG_INTERCONNECT_QCOM_QCS615 is not set
@@ -7429,6 +7361,7 @@ CONFIG_FSCACHE=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
 # end of Caches
 
 #
@@ -7462,7 +7395,7 @@ CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_VMCORE=y
 # CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
-CONFIG_SYSCTL=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
 CONFIG_KERNFS=y
@@ -7490,6 +7423,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
@@ -7509,6 +7443,7 @@ CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -7907,6 +7842,16 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_CCP is not set
+CONFIG_CRYPTO_DEV_QCE=y
+CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
+CONFIG_CRYPTO_DEV_QCE_SHA=y
+CONFIG_CRYPTO_DEV_QCE_AEAD=y
+CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
+CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
+CONFIG_CRYPTO_DEV_QCOM_RNG=y
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
@@ -7968,13 +7913,7 @@ CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_AES_ARCH=y
-CONFIG_CRYPTO_LIB_AES_CBC=y
 CONFIG_CRYPTO_LIB_AES_CBC_MACS=y
-CONFIG_CRYPTO_LIB_AES_CCM=y
-CONFIG_CRYPTO_LIB_AES_CTR=y
-CONFIG_CRYPTO_LIB_AES_ECB=y
-CONFIG_CRYPTO_LIB_AES_GCM=y
-CONFIG_CRYPTO_LIB_AES_XTS=y
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_BLAKE2B=y
@@ -7982,7 +7921,7 @@ CONFIG_CRYPTO_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CHACHA_ARCH=y
 CONFIG_CRYPTO_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
-CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_LIB_GF128HASH=y
 CONFIG_CRYPTO_LIB_GF128HASH_ARCH=y
 CONFIG_CRYPTO_LIB_MD5=y
@@ -8005,6 +7944,7 @@ CONFIG_RAID6_PQ_ARCH=y
 CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_XXHASH=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_842_COMPRESS=y
 CONFIG_842_DECOMPRESS=y
 CONFIG_ZLIB_INFLATE=y
@@ -8053,7 +7993,6 @@ CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
 CONFIG_ARCH_HAS_BATCHED_DMA_SYNC=y
 CONFIG_SWIOTLB=y
-CONFIG_SWIOTLB_DEFAULT_SIZE_MB=64
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
 CONFIG_DMA_NEED_SYNC=y
@@ -8077,7 +8016,7 @@ CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
-CONFIG_VDSO_DATASTORE=y
+CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_VDSO_GETRANDOM=y
 CONFIG_FONT_SUPPORT=y
@@ -8145,7 +8084,7 @@ CONFIG_FRAME_WARN=2048
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
-CONFIG_WARN_CONTEXT_ANALYSIS=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options
 
 #
@@ -8190,7 +8129,6 @@ CONFIG_ARCH_HAS_PTDUMP=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_PER_VMA_LOCK_STATS is not set
-# CONFIG_MEM_ALLOC_PROFILING is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SHRINKER_DEBUG is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -8203,6 +8141,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
@@ -8298,7 +8237,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FREGS=y
 CONFIG_HAVE_FTRACE_GRAPH_FUNC=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_HAVE_EXTRA_IPI_TRACEPOINTS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -8320,7 +8258,6 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_GRAPH_RETVAL is not set
 # CONFIG_FUNCTION_GRAPH_RETADDR is not set
 CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
 # CONFIG_FUNCTION_SELF_TRACING is not set
 # CONFIG_FPROBE is not set
@@ -8338,7 +8275,6 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_PROBE_EVENTS_DUMP_FETCHARG is not set
 CONFIG_KPROBE_EVENTS=y
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
@@ -8412,7 +8348,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_WORKQUEUE is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_REGION_ALLOC_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
diff --git a/aports/device/soc-fairphone-fp6-audio/APKBUILD b/aports/device/soc-fairphone-fp6-audio/APKBUILD
index 1d603ae..0478cce 100644
--- a/aports/device/soc-fairphone-fp6-audio/APKBUILD
+++ b/aports/device/soc-fairphone-fp6-audio/APKBUILD
@@ -2,12 +2,7 @@
 # yet: the AudioReach topology (built from Catcrafts/audioreach-topology
 # branch fp6), the UCM profile, and pipewire config. Files are
 # byte-identical to the ones deployed and tested on the development FP6.
-# The tplg/UCM target filenames carry the sound card model string from the
-# board DTS: the q6apm topology loader requests qcom/milos/<model>-tplg.bin
-# and alsa-ucm resolves conf.d/milos/<model>.conf. Kernel 7.3 names the card
-# "MILOS-Fairphone-Gen6", 7.2 named it "Fairphone (Gen. 6)"; both files are
-# installed under the new name with the old name as a symlink, so the package
-# serves either kernel - the one still running after an upgrade included.
+# The tplg/UCM target filenames contain spaces, hence the safe source names.
 #
 # The proprietary AW88261 amp config blob (aw88261_acf.bin) is NOT shipped
 # since pkgver 4: fp6-vendor-blobs extracts it from the stock vendor
@@ -15,8 +10,8 @@
 # distributed. Provenance/design: fp6 repo journal/blobs/.
 maintainer="Jorijn van der Graaf <jorijnvdgraaf@catcrafts.net>"
 pkgname=soc-fairphone-fp6-audio
-pkgver=5
-pkgrel=0
+pkgver=4
+pkgrel=1
 pkgdesc="Fairphone 6 audio topology and UCM profile"
 url="https://forgejo.catcrafts.net/Catcrafts/audioreach-topology"
 arch="noarch"
@@ -34,14 +29,10 @@ source="
 
 package() {
 	install -Dm644 "$srcdir"/fp6-tplg.bin \
-		"$pkgdir"/usr/lib/firmware/qcom/milos/MILOS-Fairphone-Gen6-tplg.bin
-	ln -s MILOS-Fairphone-Gen6-tplg.bin \
 		"$pkgdir/usr/lib/firmware/qcom/milos/Fairphone (Gen. 6)-tplg.bin"
 	install -Dm644 "$srcdir"/aw88261-acf.manifest \
 		"$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d/10-aw88261-acf.manifest
 	install -Dm644 "$srcdir"/ucm-milos-fp6.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/milos/MILOS-Fairphone-Gen6.conf
-	ln -s MILOS-Fairphone-Gen6.conf \
 		"$pkgdir/usr/share/alsa/ucm2/conf.d/milos/Fairphone (Gen. 6).conf"
 	install -Dm644 "$srcdir"/HiFi.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/Fairphone/fp6/HiFi.conf