From 890256c2010c8abebc17500ab4cc424959f140a5 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Wed, 31 Jul 2024 10:19:58 +0200
Subject: [PATCH] linux-postmarketos-qcom-msm8960: enable zstd firmware
 compression support (MR 5434)

See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5380

[ci:skip-build]: already built successfully in CI
---
 .../linux-postmarketos-qcom-msm8960/APKBUILD     |  4 ++--
 .../config-postmarketos-qcom-msm8960.armv7       | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-msm8960/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8960/APKBUILD
index 88e40bf48..44049d625 100644
--- a/device/testing/linux-postmarketos-qcom-msm8960/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm8960/APKBUILD
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8960"
 pkgname=linux-$_flavor
 pkgver=6.5_rc2
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel fork for Qualcomm APQ8064/MSM8960 devices"
 arch="armv7"
 _carch="arm"
@@ -50,5 +50,5 @@ package() {
 
 sha512sums="
 893bdb7364040b08b74e0775419d0d827f0d2a03d82df359cc8d8d2f1a7d6a7d2c47eb39922c44d5d895857ad4a0b4ac4fdfa32519fc1f2df4c1f880b933f5e9  linux-postmarketos-qcom-msm8960-fdf0eaf11452d72945af31804e2a1048ee1b574c.tar.gz
-5e47839b77e052795b00e477188c2852c56e6b88cad9f73368f5cf08a622baa1bc059b5fc3bed10507131cc71cd97dd9f873d948859f7ab580a1379f20dabd11  config-postmarketos-qcom-msm8960.armv7
+5a60f13e2c1772ab926e45f97e5edda5801166a0177f8ab2d6687c9a32d8a1b60348e1d6cfed50cea9f5c267a1415e84f862136571babe1a8a6daeb51ad01dc7  config-postmarketos-qcom-msm8960.armv7
 "
diff --git a/device/testing/linux-postmarketos-qcom-msm8960/config-postmarketos-qcom-msm8960.armv7 b/device/testing/linux-postmarketos-qcom-msm8960/config-postmarketos-qcom-msm8960.armv7
index 87e0f385d..6e9ba0296 100644
--- a/device/testing/linux-postmarketos-qcom-msm8960/config-postmarketos-qcom-msm8960.armv7
+++ b/device/testing/linux-postmarketos-qcom-msm8960/config-postmarketos-qcom-msm8960.armv7
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.5.0-rc2 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.1.1_git20230715) 13.1.1 20230715"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130101
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24000
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24000
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -1375,7 +1375,9 @@ CONFIG_FW_LOADER=y
 CONFIG_FW_LOADER_DEBUG=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 CONFIG_FW_CACHE=y
 # CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
@@ -5675,9 +5677,9 @@ CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=m
-CONFIG_ZSTD_COMMON=m
+CONFIG_ZSTD_COMMON=y
 CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=m
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y