From 8871f4924ff64b46df56fd51ccd943bde25be2fc Mon Sep 17 00:00:00 2001 From: Robin de Rooij Date: Sun, 16 May 2021 18:10:28 +0200 Subject: [PATCH] samsung-i9195: port to armv7 and enable swrast (MR 2175) Ported succesfully to armv7. Everything that worked on armhf works on armv7 as well: touch, wifi, usb networking etc. SWRast (gallium) was not enabled but is needed because the device does not support 3D acceleration yet. --- device/testing/device-samsung-i9195/APKBUILD | 10 ++++++---- device/testing/device-samsung-i9195/deviceinfo | 2 +- device/testing/firmware-samsung-i9195/APKBUILD | 4 ++-- device/testing/linux-samsung-i9195/APKBUILD | 12 +++++++----- ...amsung-i9195.armhf => config-samsung-i9195.armv7} | 5 ++--- 5 files changed, 18 insertions(+), 15 deletions(-) rename device/testing/linux-samsung-i9195/{config-samsung-i9195.armhf => config-samsung-i9195.armv7} (99%) diff --git a/device/testing/device-samsung-i9195/APKBUILD b/device/testing/device-samsung-i9195/APKBUILD index ea1c8015f..d93601a72 100644 --- a/device/testing/device-samsung-i9195/APKBUILD +++ b/device/testing/device-samsung-i9195/APKBUILD @@ -2,12 +2,12 @@ pkgname=device-samsung-i9195 pkgdesc="Samsung Galaxy S4 Mini" pkgver=0.3 -pkgrel=10 +pkgrel=11 url="https://postmarketos.org" license="MIT" -arch="armhf" +arch="armv7" options="!check !archcheck" -depends="postmarketos-base linux-samsung-i9195 mkbootimg" +depends="postmarketos-base linux-samsung-i9195 mkbootimg mesa-dri-gallium" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" makedepends="devicepkg-dev" source="deviceinfo" @@ -27,4 +27,6 @@ nonfree_firmware() { mkdir "$subpkgdir" } -sha512sums="bbcd37577a295733e01b4031e6a907e5640760ab7c46fe2e177d226b6d80e15b164ef6f3af6b8da14a24832ecf5fb4ee4d9b245e7fadc4f25a6ec3280558bf1c deviceinfo" +sha512sums=" +fda116762ad840bec89b720c3303d6a7cc12ee6a30b5609304cb1d66285c08b6629e2285df0174e8be49b7e93b7d69579a01bc63e598ece04be8ff62d0031a99 deviceinfo +" diff --git a/device/testing/device-samsung-i9195/deviceinfo b/device/testing/device-samsung-i9195/deviceinfo index 7fc72c4e1..056a8c8ad 100644 --- a/device/testing/device-samsung-i9195/deviceinfo +++ b/device/testing/device-samsung-i9195/deviceinfo @@ -8,7 +8,7 @@ deviceinfo_codename="samsung-i9195" deviceinfo_year="2013" deviceinfo_dtb="" deviceinfo_modules_initfs="" -deviceinfo_arch="armhf" +deviceinfo_arch="armv7" # Device related deviceinfo_chassis="handset" diff --git a/device/testing/firmware-samsung-i9195/APKBUILD b/device/testing/firmware-samsung-i9195/APKBUILD index b9062c411..e1bc30ba9 100644 --- a/device/testing/firmware-samsung-i9195/APKBUILD +++ b/device/testing/firmware-samsung-i9195/APKBUILD @@ -2,13 +2,13 @@ pkgname=firmware-samsung-i9195 # XDA post explains the meaning of the firmware version, which has been translated into the $pkgver pkgver=1.1.0 _ver=I9195XXUCQG1 -pkgrel=1 +pkgrel=2 _commit="f3c513732580e500fe27000683db268406806ed7" _commit_2="fb69a737df5f13c2975fd385a15908389fe5d5bd" pkgdesc="Samsung Galaxy S 4 Mini firmware" subpackages="$pkgname-modem $pkgname-wlan" url="https://forum.xda-developers.com/galaxy-s4-mini/general/modem-samsung-galaxy-s4-mini-gt-i9195-t3390780" -arch="armhf" +arch="armv7" license="proprietary" source="$pkgname-$_ver.tar.xz::https://drive.google.com/uc?export=download&id=1bKQ6m9avN6k2puJTZr55dIeGb8B7K_lT $pkgname-$pkgver.tar.gz::https://github.com/j0ki/firmware-samsung-i9195/archive/$_commit.tar.gz diff --git a/device/testing/linux-samsung-i9195/APKBUILD b/device/testing/linux-samsung-i9195/APKBUILD index 5a29e8ace..37f83620a 100644 --- a/device/testing/linux-samsung-i9195/APKBUILD +++ b/device/testing/linux-samsung-i9195/APKBUILD @@ -2,9 +2,9 @@ pkgname=linux-samsung-i9195 pkgver=3.4.113 -pkgrel=6 +pkgrel=7 pkgdesc="Samsung Samsung Galaxy S4 Mini kernel fork" -arch="armhf" +arch="armv7" _carch="arm" _flavor="samsung-i9195" url="https://kernel.org" @@ -49,8 +49,10 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="7ce3621f50e0c615795eed17fa5178ba2d2c3165b9267f80f088305f8cb591c704129d841cb4c82496f185a59669dccf61b527dbf21b548a923bdb96b666dc2d linux-samsung-i9195-c4b753a5d44f42cee2191ecf5504bccdf53c838d.tar.gz -ae7143619bcae5457c3c524472b59f0d383445d62de0882ea6d279af63c61189c398a3cd9c9af1e67e7dde4b9437017b62329ac3cb2f56ae4b0487d0da145da0 config-samsung-i9195.armhf +sha512sums=" +7ce3621f50e0c615795eed17fa5178ba2d2c3165b9267f80f088305f8cb591c704129d841cb4c82496f185a59669dccf61b527dbf21b548a923bdb96b666dc2d linux-samsung-i9195-c4b753a5d44f42cee2191ecf5504bccdf53c838d.tar.gz +0adc8f464d3b96484bb6a1e1282d8d6ae804a1ccddcbbccf09491c5c385dc23500940147532ebe59b3bd5bf3bcec32a89a5843ae0b2ec7f9bd824e99e4b08118 config-samsung-i9195.armv7 f85ced49ee2f2461adea68dac0a10452aa809a7d41d869092d94eb085344919a9a385dec0c48011f4601ca4f441700f7fe49075c7eca4fb2d66b01f7d413ccb7 01_msm-fix-perf_trace_counters.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch -e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd 03_fix-video-argb-setting.patch" +e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd 03_fix-video-argb-setting.patch +" diff --git a/device/testing/linux-samsung-i9195/config-samsung-i9195.armhf b/device/testing/linux-samsung-i9195/config-samsung-i9195.armv7 similarity index 99% rename from device/testing/linux-samsung-i9195/config-samsung-i9195.armhf rename to device/testing/linux-samsung-i9195/config-samsung-i9195.armv7 index 388f5a313..51b4ea00e 100644 --- a/device/testing/linux-samsung-i9195/config-samsung-i9195.armhf +++ b/device/testing/linux-samsung-i9195/config-samsung-i9195.armv7 @@ -3695,7 +3695,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 @@ -3747,7 +3746,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 @@ -3758,7 +3757,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