From 16bb203cfc33d01700794c4261b4a2ae0ddcc6cf Mon Sep 17 00:00:00 2001
From: timbz <timon.baetz@gmail.com>
Date: Fri, 15 May 2020 09:18:05 +0200
Subject: [PATCH] samsung-kylepro: change arch to armv7 (MR 1236)

---
 device/testing/device-samsung-kylepro/APKBUILD              | 6 +++---
 device/testing/device-samsung-kylepro/deviceinfo            | 2 +-
 device/testing/linux-samsung-kylepro/APKBUILD               | 6 +++---
 ...g-samsung-kylepro.armhf => config-samsung-kylepro.armv7} | 4 +---
 firmware/firmware-samsung-kylepro/APKBUILD                  | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename device/testing/linux-samsung-kylepro/{config-samsung-kylepro.armhf => config-samsung-kylepro.armv7} (99%)

diff --git a/device/testing/device-samsung-kylepro/APKBUILD b/device/testing/device-samsung-kylepro/APKBUILD
index d287c65e1..6aa57e334 100644
--- a/device/testing/device-samsung-kylepro/APKBUILD
+++ b/device/testing/device-samsung-kylepro/APKBUILD
@@ -2,10 +2,10 @@
 pkgname=device-samsung-kylepro
 pkgdesc="Samsung Galaxy Trend Plus"
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-samsung-kylepro mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -26,4 +26,4 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="d1d3d910ad6a91f4d038689c21e334eb39c8e5a7d6e16d3a166b509c03241912da9424231e00daf8c32b4f41d38fb35ed6a499b3b14e8290988b59c843c16263  deviceinfo"
+sha512sums="c6d407a525cae4f9c28e867b6b62449ef72cd3a906b3c9d04761d8163c036a7d21ae342ae622ce5da93833ba0d885aee9933f4e285e7bbdc0e0f9c836bad9c19  deviceinfo"
diff --git a/device/testing/device-samsung-kylepro/deviceinfo b/device/testing/device-samsung-kylepro/deviceinfo
index 0ae463726..a52b5991e 100644
--- a/device/testing/device-samsung-kylepro/deviceinfo
+++ b/device/testing/device-samsung-kylepro/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="samsung-kylepro"
 deviceinfo_year="2013"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"
diff --git a/device/testing/linux-samsung-kylepro/APKBUILD b/device/testing/linux-samsung-kylepro/APKBUILD
index 45ab42b5e..2e57a8409 100644
--- a/device/testing/linux-samsung-kylepro/APKBUILD
+++ b/device/testing/linux-samsung-kylepro/APKBUILD
@@ -3,9 +3,9 @@
 
 pkgname=linux-samsung-kylepro
 pkgver=3.4.113
-pkgrel=3
+pkgrel=4
 pkgdesc="Samsung Galaxy Trend Plus kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="samsung-kylepro"
 url="https://kernel.org"
@@ -43,7 +43,7 @@ package() {
 }
 
 sha512sums="b66ab7d8ed557ed095b059beb7b37d196a7290e6c8364560126a94f696718c4a61f99b1e21700d9a4b50c569243e4e2cbfc9fbd9d9517ca49cfa32f31525c27f  linux-samsung-kylepro-026cf3b3e97ec40aa1c0c52837a318725786f05a.tar.gz
-2cbb243d21a627eb1ca06aeeec2fec05d3b93905c47c52480381adc6932c8473e284a173948ce1f66311c93fa1553a2ccbc7d7173314f6cd8245b62e0bef2a4f  config-samsung-kylepro.armhf
+212a91f3f16b98c8cf5e89841c7ec4d4c1e5ee5733f871da0cfdbc8c9f23953a790061faa4b459e19d5fe7f0a9762777610b71403bea24215fe7e9bb5fb2eb86  config-samsung-kylepro.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 c40eaa11547f5bc2b1ff965506bdfe3015ff16e4b5ad9ccb3b8134ceafd1d32407c4ef2b213e02e036ce1e9bdcbfe768dff7d4b054bec77705a176c1f783b6f5  00_return_address.patch
diff --git a/device/testing/linux-samsung-kylepro/config-samsung-kylepro.armhf b/device/testing/linux-samsung-kylepro/config-samsung-kylepro.armv7
similarity index 99%
rename from device/testing/linux-samsung-kylepro/config-samsung-kylepro.armhf
rename to device/testing/linux-samsung-kylepro/config-samsung-kylepro.armv7
index 749a792fc..85691ddba 100644
--- a/device/testing/linux-samsung-kylepro/config-samsung-kylepro.armhf
+++ b/device/testing/linux-samsung-kylepro/config-samsung-kylepro.armv7
@@ -2395,7 +2395,6 @@ CONFIG_USB_G_ANDROID_SAMSUNG_COMPOSITE=y
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
 # CONFIG_USB_MTP_SAMSUNG is not set
 
 #
@@ -3090,7 +3089,6 @@ CONFIG_CRYPTO_PCOMP=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
@@ -3152,7 +3150,7 @@ CONFIG_CRYPTO_SHA256=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
diff --git a/firmware/firmware-samsung-kylepro/APKBUILD b/firmware/firmware-samsung-kylepro/APKBUILD
index ca84b1d1a..4740b99b5 100644
--- a/firmware/firmware-samsung-kylepro/APKBUILD
+++ b/firmware/firmware-samsung-kylepro/APKBUILD
@@ -1,10 +1,10 @@
 pkgname=firmware-samsung-kylepro
 pkgver=1
-pkgrel=1
+pkgrel=2
 _commit="a6725fbede9f2b1f8fa3177b8733e204c753f108"
 pkgdesc="Samsung Galaxy Trend Plus Firmware"
 url="https://github.com/Samsung-KYLEPROXX/android_vendor_samsung_kyleproxx"
-arch="armhf"
+arch="armv7"
 license="proprietary"
 source="$pkgname-$_commit.tar.gz::https://github.com/Samsung-KYLEPROXX/android_vendor_samsung_kyleproxx/archive/$_commit.tar.gz"
 options="!check !strip !archcheck !spdx"