From 22cee921f7e51319847a666d8966b026e8247021 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Sun, 25 Apr 2021 18:40:17 -0700 Subject: [PATCH] linux-purism-librem5: upgrade to 5.11.15 (MR 2140) Upstream changelog: https://source.puri.sm/Librem5/linux-next/-/commit/4e76143d2ec5694ec09da20c9e702ed2f0dbdb3f Note, previous wifi driver behavior is not changed. The redpine module still expects the fw to be in /lib/firmware on boot, and won't use the fw on the card.. Theoretically this kernel version now supports both loading fw from rootfs into ram AND using fw burned on the chip, but since I haven't tested that well yet I'm leaving this as-is. [ci:skip-build]: already built successfully in CI --- device/main/linux-purism-librem5/APKBUILD | 6 +++--- .../linux-purism-librem5/config-purism-librem5.aarch64 | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD index 3e03c9489..f67d825bf 100644 --- a/device/main/linux-purism-librem5/APKBUILD +++ b/device/main/linux-purism-librem5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft # Co-Maintainer: Bhushan Shah pkgname=linux-purism-librem5 -pkgver=5.11.11 +pkgver=5.11.15 pkgrel=0 _purismrel=1 # . @@ -75,8 +75,8 @@ dev() { ARCH="$_carch" \ INSTALL_HDR_PATH="$subpkgdir"/usr } -sha512sums="801e626e92e3d48da033f3c6bf3f8ce98be14d51a1487d5fcd046cc0fb1a64d00bff121e5441b617af998490e8132d24dfccbe99c0bc4f1a0a19bfd61f91937d linux-purism-librem5-5.11.11pureos1.tar.gz +sha512sums="09838c1c97b87d469304cf775c1b53b97026b5854312a9c35720ac35ad311999b555504e86c288ef7ade6b64dd95011f1bfbfbe490cc912a85cf70e0dc402e8a linux-purism-librem5-5.11.15pureos1.tar.gz 9870bff4b187188b519b23264c2634ee4232011fed6d2f66a7b4971db354ac3dffa0e1552bd0dc953c66ec622e18ce8899fdbcfba94f60867fc5004d6da96753 8f11380ec32912370b8ae9134a0387a6f18862f7.patch 5baae99010bde62e253fdd56f21ba096c217ba2ab9c367c80b34bc0f445a79a8fb8b5d14682f71ad6061d73c81fc16a608f4be037d792978dbbaf74267844260 0001-Revert-arm64-dts-librem5-Drop-separte-DP-device-tree.patch 1a12f74895b0fc710792e3881f23754a8eb92d25b11a2751db007a1b08f72729043d1e824096c97dc795b8e33300274887b428997ddaacf4b61f52ef3bd78ce5 0002-bq25890_charger-enter-ship-mode-on-power-off.patch -45c10ccb08ad25591019f091f48b1b742ed512628ac86f6c1d462da3623314000b88022fc13c99f7e211257d2ec60e53f61a53862ffd4e763bc2ac9cd51ea875 config-purism-librem5.aarch64" +5c3efc2ba5ec32e5b5618a9f106f0ec53b361b71f61ac441723465947bdba6e295aa1918732b3a5a3b31eeaafd378f9d99bfb342b32dc8cf4b89eb64c05c3225 config-purism-librem5.aarch64" diff --git a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 index fde80c693..f8cb429a0 100644 --- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 +++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.11.11 Kernel Configuration +# Linux/arm64 5.11.15 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.2.1_git20210328) 10.2.1 20210328" +CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100201 +CONFIG_GCC_VERSION=100301 CONFIG_LD_VERSION=235020000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 @@ -358,6 +358,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y +CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_SOCIONEXT_SYNQUACER_PREITS=y # end of ARM errata workarounds via the alternatives framework