From 609d007d1d64c406df535b5fce233274da14dd63 Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Wed, 31 Jul 2024 17:52:35 +0200 Subject: [PATCH] linux-postmarketos-qcom-sm8350: enable zstd firmware compression support (MR 5451) See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5380 [ci:skip-build]: already built successfully in CI --- .../linux-postmarketos-qcom-sm8350/APKBUILD | 4 +- .../config-postmarketos-qcom-sm8350.aarch64 | 42 ++++++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD b/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD index 91e01a679..4835272a0 100644 --- a/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-sm8350" pkgname=linux-$_flavor pkgver=6.7 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel fork for SM8350" arch="aarch64" _carch="arm64" @@ -67,5 +67,5 @@ package() { sha512sums=" 69e66fcf50d336709aa8957a7a9f493dc3ba24e8ed806ba1aca7f324ccc4dc89ad83f574b2b052c2a1ed329f4a5f6b377449629e92ce5440495b22e2e4d41ff2 linux-postmarketos-qcom-sm8350-ffb1b0db511df03829fa0c9682f2412c0db7f717.tar.gz -11d36df575f82c8fe1f2836414bbada2da57a4374baa7ba62d71225662ad7b254352e3cf5b931dcad903e42705b0e0d2789550f39770ed287164daa2fabf26a9 config-postmarketos-qcom-sm8350.aarch64 +fbc3d7e532d13aca34c4880cda05cb13a35ab11837cc12ec3937032ad6989cb080aa74707a14c52ec9190be6a9c9548b3ff69113539cc6cc68983922fcb5acc0 config-postmarketos-qcom-sm8350.aarch64 " diff --git a/device/testing/linux-postmarketos-qcom-sm8350/config-postmarketos-qcom-sm8350.aarch64 b/device/testing/linux-postmarketos-qcom-sm8350/config-postmarketos-qcom-sm8350.aarch64 index b21008c5e..377dbd485 100644 --- a/device/testing/linux-postmarketos-qcom-sm8350/config-postmarketos-qcom-sm8350.aarch64 +++ b/device/testing/linux-postmarketos-qcom-sm8350/config-postmarketos-qcom-sm8350.aarch64 @@ -2,21 +2,20 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 6.7.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="clang version 16.0.6" -CONFIG_GCC_VERSION=0 -CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=160006 -CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=160006 +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=130201 +CONFIG_CLANG_VERSION=0 +CONFIG_AS_IS_GNU=y +CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24100 +CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 -CONFIG_RUST_IS_AVAILABLE=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=125 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -150,8 +149,9 @@ CONFIG_GENERIC_SCHED_CLOCK=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_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_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 @@ -262,7 +262,7 @@ CONFIG_CRASH_DUMP=y # end of General setup CONFIG_ARM64=y -CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y CONFIG_ARM64_PAGE_SHIFT=12 @@ -482,7 +482,6 @@ 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 @@ -716,7 +715,6 @@ CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y CONFIG_LTO_NONE=y CONFIG_ARCH_SUPPORTS_CFI_CLANG=y -# CONFIG_CFI_CLANG is not set CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -772,6 +770,8 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 # end of General architecture-dependent options @@ -1672,7 +1672,9 @@ CONFIG_FW_LOADER_SYSFS=y CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y -# 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 @@ -7839,6 +7841,7 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set +# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y @@ -7852,9 +7855,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_BUG_ON_DATA_CORRUPTION is not set # end of Hardening of kernel data structures -CONFIG_CC_HAS_RANDSTRUCT=y CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set +# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options @@ -8181,9 +8184,9 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_DECOMPRESS=y -CONFIG_ZSTD_COMMON=m +CONFIG_ZSTD_COMMON=y CONFIG_ZSTD_COMPRESS=m -CONFIG_ZSTD_DECOMPRESS=m +CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_POWERPC=y @@ -8308,13 +8311,12 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_SPLIT is not set -CONFIG_PAHOLE_HAS_SPLIT_BTF=y -CONFIG_PAHOLE_HAS_BTF_TAG=y -CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set # CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y