From 220796eb88b6789dfd57a290ed09742bb7bbac1d Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Tue, 12 May 2020 19:51:44 -0700
Subject: [PATCH] linux-purism-librem5: upgrade to 5.6.5 (MR 1231)

---
 device/testing/linux-purism-librem5/APKBUILD  | 12 +++++------
 .../config-purism-librem5.aarch64             | 21 ++++++++++---------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/device/testing/linux-purism-librem5/APKBUILD b/device/testing/linux-purism-librem5/APKBUILD
index be4098fba..87c14fa76 100644
--- a/device/testing/linux-purism-librem5/APKBUILD
+++ b/device/testing/linux-purism-librem5/APKBUILD
@@ -2,11 +2,9 @@
 # Kernel config based on: arch/arm64/configs/librem5-devkit_defconfig
 pkgname=linux-purism-librem5
 # <kernel ver>.<purism kernel release>
-pkgver=5.6.0
-_purismver=${pkgver}_rc7+librem5.1
-# Note: abusing pkgrel due to not using _rc# earlier, so package is still an
-# 'upgrade'. When 5.6.1 is out, stop doing this.
-pkgrel=1
+pkgver=5.6.5
+_purismver=${pkgver}+librem5.1
+pkgrel=0
 pkgdesc="Purism Librem 5 phone kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -55,5 +53,5 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb"
 
 }
-sha512sums="9371906611216ea7d2f66171b5abf2d0dcf769ec5b2dbe15123da39f30f1121e7c1104b8f67e27ee3be8dab3cb29a472ee87b48ea8161ae83f4fd108637e7548  linux-purism-librem5-5.6.0_rc7+librem5.1.tar.gz
-7189c0211457284a93106a24e80e084fb991d2162a7eb65eb52cd9fe4df4ab87fccbba1b2c35fe88766b33e1c23eff9305982ae82f78a3f40263a25d661346f3  config-purism-librem5.aarch64"
+sha512sums="dcfb78b87f46e03c1c3ed070ac85693f00534c113715279ac2848e8ff4d7a615bc853faaf5b8b02979e7e058ca1297bcab9ac633612ae399104d1b49a38e644d  linux-purism-librem5-5.6.5+librem5.1.tar.gz
+1edff35701c61acd82243550ed9cf63e344e32ca0c13d87524e64918b3b712736f44862188990fa2be6fe5e582a8e9b9d9e13a96fcd4b956ee8eea93a3ca2d81  config-purism-librem5.aarch64"
diff --git a/device/testing/linux-purism-librem5/config-purism-librem5.aarch64 b/device/testing/linux-purism-librem5/config-purism-librem5.aarch64
index bc367fb30..961f4d510 100644
--- a/device/testing/linux-purism-librem5/config-purism-librem5.aarch64
+++ b/device/testing/linux-purism-librem5/config-purism-librem5.aarch64
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.6.0-rc7 Kernel Configuration
+# Linux/arm64 5.6.5 Kernel Configuration
 #
 
 #
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
+# Compiler: gcc (Alpine 9.3.0) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=90300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -5003,7 +5003,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y
 # DEVFREQ Drivers
 #
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=y
-CONFIG_ARM_IMX_DEVFREQ=y
+CONFIG_ARM_IMX_BUS_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_EXTCON=y
 
@@ -5587,8 +5587,8 @@ CONFIG_PM_OPP=y
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_IMX=y
-CONFIG_INTERCONNECT_IMX8MM=y
-CONFIG_INTERCONNECT_IMX8MN=y
+# CONFIG_INTERCONNECT_IMX8MM is not set
+# CONFIG_INTERCONNECT_IMX8MN is not set
 CONFIG_INTERCONNECT_IMX8MQ=y
 # CONFIG_COUNTER is not set
 # end of Device Drivers
@@ -5859,7 +5859,7 @@ CONFIG_KEYS=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_KEY_DH_OPERATIONS is not set
+CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@@ -5941,7 +5941,7 @@ CONFIG_CRYPTO_ENGINE=m
 # Public-key cryptography
 #
 CONFIG_CRYPTO_RSA=y
-# CONFIG_CRYPTO_DH is not set
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECRDSA is not set
@@ -6054,8 +6054,9 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_HASH_INFO=y