From 7cc16455ed4b7b3918f79c271b65306f0276cdc9 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Wed, 31 Jul 2024 11:18:57 +0200
Subject: [PATCH] linux-postmarketos-qcom-sm6125: enable zstd firmware
 compression support (MR 5443)

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

[ci:skip-build]: already built successfully in CI
---
 .../testing/linux-postmarketos-qcom-sm6125/APKBUILD |  4 ++--
 .../config-postmarketos-qcom-sm6125.aarch64         | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD b/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD
index 44ac45b40..9d02fd4a9 100644
--- a/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Lux Aliaga <they@mint.lgbt>
 pkgname=linux-postmarketos-qcom-sm6125
 pkgver=6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SM6125 devices"
 arch="aarch64"
 _carch="arm64"
@@ -64,5 +64,5 @@ package() {
 
 sha512sums="
 e41aa6fa99cdb76f1748547e1b140721e30ced86d3e2aa2f94cc56be8a8f89fd0578f041061c0b6992cf49e73ee4b78cc6529943d37087c27894094730ca1e93  linux-postmarketos-qcom-sm6125-77de535b8dbd8f483b5802c8937cb714bab5b485.tar.gz
-c16ec85c55d844b8744d03067fe5041a8b45ee51527116f27a1a14d16c3601bd1b960ce8667bfee1fc4e7c02fbd9b1a238a22a8a21dc8778f140754e72c260ee  config-postmarketos-qcom-sm6125.aarch64
+7b7babe738d05cb2bcd84191d8da7c2132643d0cb521a161d5a9356ce661095005bb7968b710777d5a1c1ef1600858daf2a39f07cf7af9b699a88524b51bc324  config-postmarketos-qcom-sm6125.aarch64
 "
diff --git a/device/testing/linux-postmarketos-qcom-sm6125/config-postmarketos-qcom-sm6125.aarch64 b/device/testing/linux-postmarketos-qcom-sm6125/config-postmarketos-qcom-sm6125.aarch64
index fa751338f..f7e3d25ab 100644
--- a/device/testing/linux-postmarketos-qcom-sm6125/config-postmarketos-qcom-sm6125.aarch64
+++ b/device/testing/linux-postmarketos-qcom-sm6125/config-postmarketos-qcom-sm6125.aarch64
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # 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