From 22db6d05415d38dace7de81473320434ac02d99f Mon Sep 17 00:00:00 2001
From: Niklas Cathor <niklas.cathor@gmx.de>
Date: Mon, 6 Apr 2020 16:23:55 +0200
Subject: [PATCH] samsung-kminilte: change arch to armv7 (!1130)

- disable CONFIG_CRYPTO_SHA256_ARM, since it causes the build to fail with:
    arch/arm/crypto/sha256-core.S:1831: Error: thumb conditional instruction should be in IT block
---
 device/testing/device-samsung-kminilte/APKBUILD             | 6 +++---
 device/testing/device-samsung-kminilte/deviceinfo           | 2 +-
 device/testing/linux-samsung-kminilte/APKBUILD              | 6 +++---
 ...samsung-kminilte.armhf => config-samsung-kminilte.armv7} | 4 +---
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename device/testing/linux-samsung-kminilte/{config-samsung-kminilte.armhf => config-samsung-kminilte.armv7} (99%)

diff --git a/device/testing/device-samsung-kminilte/APKBUILD b/device/testing/device-samsung-kminilte/APKBUILD
index f11e36bae..c26e1a135 100644
--- a/device/testing/device-samsung-kminilte/APKBUILD
+++ b/device/testing/device-samsung-kminilte/APKBUILD
@@ -3,10 +3,10 @@
 pkgname="device-samsung-kminilte"
 pkgdesc="Samsung Galaxy S5 Mini"
 pkgver=0.1
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-samsung-kminilte mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -25,5 +25,5 @@ package() {
 }
 
 
-sha512sums="68e9a9b565cb10f74ab79a74d4f5cd4b1f2c54e34cdda93a1a69e10e503ac79782c337216f1e0f60c1a871d4a2dd4064cac30ade621e16ab61d7ac4daeb3fcb4  deviceinfo
+sha512sums="cef10768f39751da6d30c14da383782caf652d07e23a1377e699580ecf59a4a3778e6122cd5d6fa59fa4b98680b53245ccabb94de5927e5075008ff4db52cf78  deviceinfo
 245efec73f85ef715c877d6c24eb4b7b677d250bd38167dc19b1b0ed84c3ea91049576adbbf21dd48940c08e40f0294a1a01b0ab3e56efd794109a7e7ebc1104  fb.modes"
diff --git a/device/testing/device-samsung-kminilte/deviceinfo b/device/testing/device-samsung-kminilte/deviceinfo
index 2489287ef..4a1d45eda 100644
--- a/device/testing/device-samsung-kminilte/deviceinfo
+++ b/device/testing/device-samsung-kminilte/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="samsung-kminilte"
 deviceinfo_year="2014"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"
diff --git a/device/testing/linux-samsung-kminilte/APKBUILD b/device/testing/linux-samsung-kminilte/APKBUILD
index 70a0c38ec..38d65e95f 100644
--- a/device/testing/linux-samsung-kminilte/APKBUILD
+++ b/device/testing/linux-samsung-kminilte/APKBUILD
@@ -2,9 +2,9 @@
 
 pkgname="linux-samsung-kminilte"
 pkgver=3.4.113
-pkgrel=2
+pkgrel=3
 pkgdesc="Samsung Galaxy S5 Mini kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="samsung-kminilte"
 url="https://github.com/cm-3470/android_kernel_samsung_kminilte"
@@ -48,5 +48,5 @@ package() {
 }
 
 sha512sums="351b043822d9fc25a002f07a490422341fd03671d661bb949085ef8d69042f1ae528f80ade7076aba3eaffec80f65c09fdbb600ffe04063c69d876c22a53709b  linux-samsung-kminilte-7a8c010f226189116dcf2301d338555ae0d270c3.tar.gz
-c260d491d1c2d69f85d392613a6bcbfa920ae61b91d8c79fd6349d657e76806330e5c1ab992ec3c6835a070ef2880d2c9d81133c59df0ef5aa6713c9dc8caf17  config-samsung-kminilte.armhf
+21ab0cfa31f0c7297676f86425d0135f639e03a16658979bc3a81160e528b4f0160ed4d743ac6a327f075cc553481f04d6f608506d5794649310935412f5161c  config-samsung-kminilte.armv7
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h"
diff --git a/device/testing/linux-samsung-kminilte/config-samsung-kminilte.armhf b/device/testing/linux-samsung-kminilte/config-samsung-kminilte.armv7
similarity index 99%
rename from device/testing/linux-samsung-kminilte/config-samsung-kminilte.armhf
rename to device/testing/linux-samsung-kminilte/config-samsung-kminilte.armv7
index 56e45fc68..0c3a39bf3 100644
--- a/device/testing/linux-samsung-kminilte/config-samsung-kminilte.armhf
+++ b/device/testing/linux-samsung-kminilte/config-samsung-kminilte.armv7
@@ -2813,8 +2813,6 @@ CONFIG_LEDS_KTD2026=y
 CONFIG_FLASHLIGHT=y
 CONFIG_RT_FLASH_LED=y
 # CONFIG_FLED_RT5033 is not set
-# CONFIG_FLED_RT5033_I2C is not set
-# CONFIG_FLED_RT5033_EXT_GPIO is not set
 
 #
 # LED Triggers
@@ -3606,7 +3604,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA256_ARM=y
+# CONFIG_CRYPTO_SHA256_ARM is not set
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA512_ARM_NEON=y
 # CONFIG_CRYPTO_TGR192 is not set