From 1b56b3a8957e42f03ec23d4e933001aaba487a37 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Wed, 31 Jul 2024 11:35:11 +0200
Subject: [PATCH] linux-postmarketos-qcom-sm6225: enable zstd firmware
 compression support (MR 5444)

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

[ci:skip-build]: already built successfully in CI
---
 .../linux-postmarketos-qcom-sm6225/APKBUILD     |  4 ++--
 .../config-postmarketos-qcom-sm6225.aarch64     | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-sm6225/APKBUILD b/device/testing/linux-postmarketos-qcom-sm6225/APKBUILD
index dabc2c2ea..db17e9281 100644
--- a/device/testing/linux-postmarketos-qcom-sm6225/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sm6225/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: TQMatvey <maybeetube@gmail.com>
 pkgname=linux-postmarketos-qcom-sm6225
 pkgver=6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SM6225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -62,5 +62,5 @@ package() {
 
 sha512sums="
 df2584f29d4e2c753eed2f843da9c2134211c6359d0bd58d0d5f3ab3baf6cdebf57e37997da5a92a2401669329fcb30dd3c8c2c65c7be1eb86fe67abc9c2da91  linux-postmarketos-qcom-sm6225-849f3f471b6268280dc8418e0bddda435ae5d4a5.tar.gz
-ce5856fd55973fea0678dbe646e5688c142cee9c84ae4a5c76ab003a6f368de640577a5c13261393b8a4b72aa84a492a1e84683b5cc02ae0b6ad6396ae110765  config-postmarketos-qcom-sm6225.aarch64
+b14ed478c2e88690334b328481272f2c951b4438db2c8366856c2bdf37082813f8962884c1b95e04f9604bd397c7c3739d10d61b72e952db89d10f787bc610c8  config-postmarketos-qcom-sm6225.aarch64
 "
diff --git a/device/testing/linux-postmarketos-qcom-sm6225/config-postmarketos-qcom-sm6225.aarch64 b/device/testing/linux-postmarketos-qcom-sm6225/config-postmarketos-qcom-sm6225.aarch64
index 2de5d18c3..b1ced46b1 100644
--- a/device/testing/linux-postmarketos-qcom-sm6225/config-postmarketos-qcom-sm6225.aarch64
+++ b/device/testing/linux-postmarketos-qcom-sm6225/config-postmarketos-qcom-sm6225.aarch64
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.0-sm6225 Kernel Configuration
+# Linux/arm64 6.1.0-sm6125 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120201
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -154,7 +154,6 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_GCC12_NO_ARRAY_BOUNDS=y
-CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -1636,7 +1635,9 @@ CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK 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
@@ -6759,10 +6760,8 @@ CONFIG_SC_GCC_7280=m
 # CONFIG_SDX_GCC_65 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
-# CONFIG_SM_DISPCC_6125 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
-CONFIG_SM_GCC_6225=y
 # CONFIG_SM_GCC_6350 is not set
 # CONFIG_SM_GCC_6375 is not set
 # CONFIG_SM_GCC_8150 is not set