From 69d261b19820667312162178d973995a306a0a3c Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Tue, 30 Jul 2024 22:19:05 +0200 Subject: [PATCH] linux-google-smaug: enable zstd firmware compression support (MR 5420) See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5380 [ci:skip-build]: already built successfully in CI --- device/testing/linux-google-smaug/APKBUILD | 4 ++-- .../config-google-smaug.aarch64 | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/device/testing/linux-google-smaug/APKBUILD b/device/testing/linux-google-smaug/APKBUILD index c0e301a75..4bcb001e3 100644 --- a/device/testing/linux-google-smaug/APKBUILD +++ b/device/testing/linux-google-smaug/APKBUILD @@ -1,6 +1,6 @@ pkgname=linux-google-smaug pkgver=6.3.13 -pkgrel=1 +pkgrel=2 pkgdesc="Mainline kernel fork for Google Pixel C" arch="aarch64" _flavor="${pkgname#linux-}" @@ -65,7 +65,7 @@ package() { sha512sums=" 850f56587c49c7ad3e4873a4b9d8160b0b015ac00dbe272d3fd4b661d18a6e73d1d9dea69376fa002d47b195648c617ef0143a54cdf3bf7c361f0b90cc262e16 linux-6.3.13.tar.xz -27ea6d60337ce02a2e484556c5a9d536197792c399693fe00848e6dbeb13b66540dc1803a0d095816ddc8d0609ffa340ef14f1ae831230c31fb7420527cbc938 config-google-smaug.aarch64 +a051d6a838111011f872c5c373a40b9d7b961df61510346e400db113b781a58936be62ade61b5b00de083f5bfd8e994dfc4abd65e72ae76c09b1f4240d6d897f config-google-smaug.aarch64 e0d397f36fece6fbcdef81803bc2c694ad0a085bfa9afb20f2ff20d6981dfc5e0d931608fbdab8eddd01809ce756fae3beb59eb45ea2bff80302bdd74ae0663a 0001-Add-JDI-LPM102A188A-display-panel-support.patch 1979cb9316c8253c500d0e21b4b6981f3028ced29ee0a609b3b4d017148afc62ade1a9dca34732d33c1fc94ed723f7d51fa4a06b1f7c8c413b012af7096b89b9 0002-arm64-dts-nvidia-tegra210-smaug-Add-touch.patch " diff --git a/device/testing/linux-google-smaug/config-google-smaug.aarch64 b/device/testing/linux-google-smaug/config-google-smaug.aarch64 index 179470324..c77033a77 100644 --- a/device/testing/linux-google-smaug/config-google-smaug.aarch64 +++ b/device/testing/linux-google-smaug/config-google-smaug.aarch64 @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.3.0-rc6 Kernel Configuration +# Linux/arm64 6.3.13 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r9) 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=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 @@ -153,7 +153,6 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y @@ -950,6 +949,7 @@ CONFIG_SECRETMEM=y CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y # CONFIG_LRU_GEN is not set +CONFIG_LOCK_MM_AND_FIND_VMA=y # # Data Access Monitoring @@ -1686,7 +1686,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=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 @@ -6504,6 +6506,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set 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_DEBUG_INFO_BTF is not set # CONFIG_GDB_SCRIPTS is not set @@ -6556,7 +6559,6 @@ CONFIG_HAVE_KCSAN_COMPILER=y CONFIG_SLUB_DEBUG=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_PAGE_OWNER is not set -# CONFIG_PAGE_TABLE_CHECK is not set # CONFIG_PAGE_POISONING is not set # CONFIG_DEBUG_PAGE_REF is not set # CONFIG_DEBUG_RODATA_TEST is not set