From 187aceea773c4037ffa9907d82cb3c5f4f912ab1 Mon Sep 17 00:00:00 2001
From: Philip Scherer <philip.luca.scherer@gmail.com>
Date: Thu, 25 Feb 2021 18:23:20 +0100
Subject: [PATCH] lg-d855: switch arch to armv7 (MR 1991)

Contiributes to: #599

[ci:skip-build] Already built on CI
---
 device/testing/device-lg-d855/APKBUILD                      | 6 +++---
 device/testing/device-lg-d855/deviceinfo                    | 2 +-
 device/testing/linux-lg-d855/APKBUILD                       | 6 +++---
 .../{config-lg-d855.armhf => config-lg-d855.armv7}          | 3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename device/testing/linux-lg-d855/{config-lg-d855.armhf => config-lg-d855.armv7} (99%)

diff --git a/device/testing/device-lg-d855/APKBUILD b/device/testing/device-lg-d855/APKBUILD
index 363678e57..1f8524094 100644
--- a/device/testing/device-lg-d855/APKBUILD
+++ b/device/testing/device-lg-d855/APKBUILD
@@ -1,10 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-d855
 pkgver=1
-pkgrel=22
+pkgrel=23
 pkgdesc="LG G3 International"
 url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
 license="MIT"
 depends="postmarketos-base linux-lg-d855 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -21,5 +21,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="c393d8d21edb7b0e7d232484b86be12aa13b474590cdab37ef735eaba2ac7e645b810ecec4c3cf1220b5586311e30fc97de1052827e8ef91fab25bfcbb6a8cf7  deviceinfo
+sha512sums="055d4a78b8b6ad205e37e8a66ad6f96f660091d90e5e11862d3b4733ebc91c1b57df8892c0a28dbfbc0e0f07e082115afe67976d13343b22a931eb6a3461b01a  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules"
diff --git a/device/testing/device-lg-d855/deviceinfo b/device/testing/device-lg-d855/deviceinfo
index d77573d5b..ab08891d1 100644
--- a/device/testing/device-lg-d855/deviceinfo
+++ b/device/testing/device-lg-d855/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="true"
 deviceinfo_flash_method="fastboot"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Splash screen
 deviceinfo_screen_width="1440"
diff --git a/device/testing/linux-lg-d855/APKBUILD b/device/testing/linux-lg-d855/APKBUILD
index 2429ba275..da4304535 100644
--- a/device/testing/linux-lg-d855/APKBUILD
+++ b/device/testing/linux-lg-d855/APKBUILD
@@ -3,9 +3,9 @@
 
 pkgname=linux-lg-d855
 pkgver=3.4.0
-pkgrel=14
+pkgrel=15
 pkgdesc="LG G3 International kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="lg-d855"
 url="https://kernel.org"
@@ -51,6 +51,6 @@ package() {
 }
 
 sha512sums="a2e7c0575a677846f734804a462729ca97505101e9090231aeeae5c863b9d1a65d227f04a302157ee9579336be4f8b589f77cb7916ee7d8fc8b8d7fb97295374  linux-lg-d855-efce7b0879c76224f5bf37d8a1025eaed99192b0.tar.gz
-760af73704566c8d1eb54319c7273c17ca4bcaaa1efa7499e4d6c1300c2c17e16af2e2e0b36f5a944be2971e6b43fec2b0108eb9b41aca6f161b3548c0957a62  config-lg-d855.armhf
+c34ba3ab3e771fd8d5cdfbdf11cf026972756bbea046759431d022bfc621276c49794404035d84f260159c040d79c950ed91fd6c85e83181803f0a0490d70443  config-lg-d855.armv7
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"
diff --git a/device/testing/linux-lg-d855/config-lg-d855.armhf b/device/testing/linux-lg-d855/config-lg-d855.armv7
similarity index 99%
rename from device/testing/linux-lg-d855/config-lg-d855.armhf
rename to device/testing/linux-lg-d855/config-lg-d855.armv7
index af9714246..27a0665eb 100644
--- a/device/testing/linux-lg-d855/config-lg-d855.armhf
+++ b/device/testing/linux-lg-d855/config-lg-d855.armv7
@@ -3602,7 +3602,6 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_ABLK_HELPER=y
 # CONFIG_CRYPTO_USER is not set
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=y
@@ -3663,7 +3662,7 @@ CONFIG_CRYPTO_SHA512_ARM_NEON=y
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_ARM=y
-CONFIG_CRYPTO_AES_ARM_BS=y
+# CONFIG_CRYPTO_AES_ARM_BS is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set