From 79866613ee152a49a61fc16e18da34c3c97b898d Mon Sep 17 00:00:00 2001 From: Arnav Singh Date: Fri, 9 Feb 2024 12:18:20 -0800 Subject: [PATCH] main/linux-postmarketos-allwinner: support zstd-compressed firmware (MR 4812) This is in preparation for aports/linux-firmware switching to zstd compression in https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/60282 --- device/main/linux-postmarketos-allwinner/APKBUILD | 6 +++--- .../config-postmarketos-allwinner.aarch64 | 4 +++- .../config-postmarketos-allwinner.armv7 | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index 5b7628f4b..fcd1d00ec 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -4,7 +4,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=6.7.2_git20240127 -pkgrel=1 +pkgrel=2 _tag="orange-pi-6.7-20240127-1717" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -84,8 +84,8 @@ package() { sha512sums=" 0135ca518e82c7f858a7892b87c79e875d5f3f8d3ea884a969e6f3bb7f2a1fe260058debecce286e00a96b03c297533e4edf1859095837bd664793a29aaca41b linux-postmarketos-allwinner-orange-pi-6.7-20240127-1717.tar.gz -99f1bd92585e028ed1a70d7c87c91ed4391b80fe4c0f42b15eca225f0b87b3ae5025d59b8d87af35401c9d23eb928bd14f79c16a6ec99b78cb4aeaa5a5f8f253 config-postmarketos-allwinner.aarch64 -3f4fe88c36c2d14d4edc698fa0b804e0ee95ace2e6662f6b03d6dd140f10c1ca423e86ba12a0a9132bda1dd36a201307fa463a4f3e98daa71f91d748cb6547ae config-postmarketos-allwinner.armv7 +f082afda7caeac9d8c0f91fbaab7b1d9e25ef9c0777ea7199340e460219ca13f056e201dd6dfa5b530cd2f667e7f6888957732675fca715e06b50387cd267854 config-postmarketos-allwinner.aarch64 +5cf0dd2fd3ee1146546cd43023f42577847f734870f19f88045eea5f408b9d16ea75072ed1e4fb384af4bb2655f554fd3b3f449de9adb554cdce612760a23bd9 config-postmarketos-allwinner.armv7 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch 99edeccdee7beae5dc7337d78ba92de2f3d724b7648ede30ab040a66bdac0e38a6595e212e26011d608ccb8a92ffa9e393965f936dfead65ffe9b7eb31dfa345 0002-dts-add-pinetab-dev-old-display-panel.patch 82c0203b02c671934d62e52311827ac1cc5b358e0843715ea2235117e4b47d6de63b29fdfc7c1adfc550cc7eb363c384de8276be1ca17da6e48916020124022d 0003-dts-pinetab-add-missing-bma223-ohci1.patch diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 37d614ced..92bee895b 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -1565,7 +1565,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 diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index 37cee8953..583b0516e 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -1377,7 +1377,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