From a717748133283f323628cc01a4e6e7bcdafe25e0 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Tue, 30 Jul 2024 12:42:42 +0200
Subject: [PATCH] linux-postmarketos-allwinner-d1: enable zstd firmware
 compression support (MR 5406)

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

[ci:skip-build]: already built successfully in CI
---
 .../testing/linux-postmarketos-allwinner-d1/APKBUILD |  4 ++--
 .../config-postmarketos-allwinner-d1.riscv64         | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/device/testing/linux-postmarketos-allwinner-d1/APKBUILD b/device/testing/linux-postmarketos-allwinner-d1/APKBUILD
index 6ea0880ce..0cce10df0 100644
--- a/device/testing/linux-postmarketos-allwinner-d1/APKBUILD
+++ b/device/testing/linux-postmarketos-allwinner-d1/APKBUILD
@@ -5,7 +5,7 @@
 _flavor="postmarketos-allwinner-d1"
 pkgname=linux-$_flavor
 pkgver=6.1_rc3
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel fork for d1/d1-h"
 arch="riscv64"
 _carch="riscv"
@@ -75,5 +75,5 @@ package() {
 
 sha512sums="
 7f3daae1964118df9a764557848742e8d34a40c26c41bf4c3012cbbbd78c3d795041e9081c9312a0f088aadd4126887238ee1aafec3f9137fc755f4865e2f5b1  linux-postmarketos-allwinner-d1-9496edef9edad6eb4a3c6808b0d81fe68754f02f.tar.gz
-180222615f4d44ea8a2ed53819ab238b3dd2720993c666c1090ccfb640d83cdb1c48f6aadabf3a59020bb9d25fbf369c4f6b96e20422c3e5748800e6e0f0b6a4  config-postmarketos-allwinner-d1.riscv64
+bd748d320eb91bc0b30d3808cda8d30768075948da21004eacf20700d01fe54a9abd68f50f23a1ff11e86e77f896af235eb9a1683b264e104c5c2295fc7f121e  config-postmarketos-allwinner-d1.riscv64
 "
diff --git a/device/testing/linux-postmarketos-allwinner-d1/config-postmarketos-allwinner-d1.riscv64 b/device/testing/linux-postmarketos-allwinner-d1/config-postmarketos-allwinner-d1.riscv64
index b6548148a..73e7222bc 100644
--- a/device/testing/linux-postmarketos-allwinner-d1/config-postmarketos-allwinner-d1.riscv64
+++ b/device/testing/linux-postmarketos-allwinner-d1/config-postmarketos-allwinner-d1.riscv64
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/riscv 6.1.0-rc3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="riscv64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="riscv64-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
@@ -138,7 +138,6 @@ CONFIG_GENERIC_SCHED_CLOCK=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_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -1571,7 +1570,7 @@ CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_LOADER_COMPRESS_XZ=y
-# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 # CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
 
@@ -6649,6 +6648,7 @@ CONFIG_DEBUG_KERNEL=y
 #
 # Compile-time checks and compiler options
 #
+CONFIG_AS_HAS_NON_CONST_LEB128=y
 CONFIG_DEBUG_INFO_NONE=y
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set