From 261fcf3c76790fc65aec48edc5a91b92129c7ffa Mon Sep 17 00:00:00 2001 From: CactiChameleon9 Date: Sat, 19 Jun 2021 15:00:58 +0100 Subject: [PATCH] htc-m8: change arch to armv7 (MR 2262) [ci:skip-vercheck] --- device/testing/device-htc-m8/APKBUILD | 10 ++++++---- device/testing/device-htc-m8/deviceinfo | 3 ++- device/testing/firmware-htc-m8/APKBUILD | 8 +++++--- device/testing/linux-htc-m8/APKBUILD | 12 +++++++----- .../{config-htc-m8.armhf => config-htc-m8.armv7} | 3 +-- 5 files changed, 21 insertions(+), 15 deletions(-) rename device/testing/linux-htc-m8/{config-htc-m8.armhf => config-htc-m8.armv7} (99%) diff --git a/device/testing/device-htc-m8/APKBUILD b/device/testing/device-htc-m8/APKBUILD index 1c64c2fb1..210e737fd 100644 --- a/device/testing/device-htc-m8/APKBUILD +++ b/device/testing/device-htc-m8/APKBUILD @@ -2,10 +2,10 @@ pkgname=device-htc-m8 pkgdesc="HTC One M8" pkgver=0.1 -pkgrel=9 +pkgrel=10 url="https://postmarketos.org" license="MIT" -arch="armhf" +arch="armv7" options="!check !archcheck" depends="linux-htc-m8 mkbootimg mesa-dri-swrast msm-fb-refresher postmarketos-base" makedepends="devicepkg-dev" @@ -30,6 +30,8 @@ nonfree_firmware() { mkdir "$subpkgdir" } -sha512sums="b0be08a058c9191e650e0df56706048afd0e4c1b78ac787bbe65d89d51ee296880c82155b396ba308d9359c589e041e19d393e1e5f66d3a6e4276f66330257b2 deviceinfo +sha512sums=" +ba04967145d35240ea47a18723a0e4b11222f761d0b13ee7fb58faf399666abfeebe5b2d5ab39e2e895d7e83b9cd464db7b76782c2c604634415906c87982bcd deviceinfo 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb initfs-hook.sh -f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66 90-android-touch-dev.rules" +f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66 90-android-touch-dev.rules +" diff --git a/device/testing/device-htc-m8/deviceinfo b/device/testing/device-htc-m8/deviceinfo index adb84314a..824e06324 100644 --- a/device/testing/device-htc-m8/deviceinfo +++ b/device/testing/device-htc-m8/deviceinfo @@ -9,7 +9,7 @@ deviceinfo_year="2014" deviceinfo_dtb="" deviceinfo_modules_initfs="" deviceinfo_external_storage_install="true" -deviceinfo_arch="armhf" +deviceinfo_arch="armv7" # Device related deviceinfo_chassis="handset" @@ -29,3 +29,4 @@ deviceinfo_flash_offset_ramdisk="0x02008000" deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x01e00000" deviceinfo_flash_pagesize="2048" +deviceinfo_flash_sparse="true" diff --git a/device/testing/firmware-htc-m8/APKBUILD b/device/testing/firmware-htc-m8/APKBUILD index 4f35ce204..f5cb59f27 100644 --- a/device/testing/firmware-htc-m8/APKBUILD +++ b/device/testing/firmware-htc-m8/APKBUILD @@ -3,7 +3,7 @@ pkgver=1 pkgrel=0 pkgdesc="Firmware files for HTC One M8" url="https://github.com/TheMuppets/proprietary_vendor_htc" -arch="armhf" +arch="armv7" license="proprietary" depends="wcnss-wlan" options="!strip !check !archcheck !spdx" @@ -33,7 +33,8 @@ package() { done } -sha512sums="80de3dde5ccbb292bd1a2a28847be542e246859a271f8b1db1ede129c85c1594e4a9499540897d9b0503a58ed782a6ac3e7a130296769dbd464c721af80fa44b firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-wcnss.b00 +sha512sums=" +80de3dde5ccbb292bd1a2a28847be542e246859a271f8b1db1ede129c85c1594e4a9499540897d9b0503a58ed782a6ac3e7a130296769dbd464c721af80fa44b firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-wcnss.b00 46302f43d1b2431fa95adc05e01de3c668a591425bc1ffd52a1aecdd1d2342a7bce07549ff43d1a91ce8e36202d754fc23e6fbb6ede09ae3f6f41249a43611b3 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-wcnss.b01 2e1bcdfaac92064358693126adfe4ec25be6e075c35ba9400cf36649111f854511d351e697ef281737478cc16ca289b73ccc8b44f0ff89c5eeb6eb20ad866253 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-wcnss.b02 63d7bcf22ab13da27ed15301c1129dbb286e1793cb491c1d025909a163eeb55a881918911cae6e2f1ad4a4698a26b95f13028fa3153bca567dfd9e0a4898bfb5 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-wcnss.b04 @@ -44,4 +45,5 @@ bab20dc74c757a30afad00192a1a4cc18e48713f33557a70e27c1bb0276e29300768f17ebc09bd49 edf8ecd23503ef160eff881223ff161a9dc37917546a7e71e7f5fb73cee786bf93ccb0b208587888be29478adea293123156647b611ca6835234b24ae79c8c92 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-wcnss.mdt fb92214f928143228c0683934342ceff11f19bec0581684e98e155262bed03f51c21a21881ec03316f917c127b607a2943efea4847b908f1c02864a1e507fb50 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-WCNSS_cfg.dat 08cef17a17972f97c012bd2ef921b5e509a3372ff52cc5d0904bf88f1b6d8c37a33bb06e3676cea707513afbc0dba34436996bee5af4f291591e2bc3a5e37921 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-WCNSS_qcom_cfg.ini -0dd92b6f97731e84c0aaa01b0cc1651ada0fa55d279ec436128266a76b52ddb1d45961956f06e0cfd59ac96832e4bc68458999400a40998d0e1fb176a4010391 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-WCNSS_qcom_wlan_nv.bin" +0dd92b6f97731e84c0aaa01b0cc1651ada0fa55d279ec436128266a76b52ddb1d45961956f06e0cfd59ac96832e4bc68458999400a40998d0e1fb176a4010391 firmware-htc-m8-81b0d1394261882adfef18d72f38eec2189f5e7a-WCNSS_qcom_wlan_nv.bin +" diff --git a/device/testing/linux-htc-m8/APKBUILD b/device/testing/linux-htc-m8/APKBUILD index e9a182f20..4555cf3de 100644 --- a/device/testing/linux-htc-m8/APKBUILD +++ b/device/testing/linux-htc-m8/APKBUILD @@ -2,9 +2,9 @@ pkgname=linux-htc-m8 pkgver=3.4.113 -pkgrel=5 +pkgrel=6 pkgdesc="HTC One M8 kernel fork" -arch="armhf" +arch="armv7" _carch="arm" _flavor="htc-m8" url="https://kernel.org" @@ -57,9 +57,11 @@ package() { "$pkgdir/boot/dt.img" } -sha512sums="3f826c698af5839fd83e9204d8d4c28db35a0e8c174c0cef005acea5fa53b2463fb0d984f2d1c99e8608ecd9698fb59e954f2e7218688f75a97fee735b7b9856 linux-htc-m8-1e7a57485c90cb838cffe022831e6bec4a599548.tar.gz -3574ac3ec585a1386d413c93766b17237bdeecf8ba568418ca8f5863b2499190b2e63e8cf28d142d920f56be562f066d0df7e92362eb2fa7b13f2673c65a4fa0 config-htc-m8.armhf +sha512sums=" +3f826c698af5839fd83e9204d8d4c28db35a0e8c174c0cef005acea5fa53b2463fb0d984f2d1c99e8608ecd9698fb59e954f2e7218688f75a97fee735b7b9856 linux-htc-m8-1e7a57485c90cb838cffe022831e6bec4a599548.tar.gz +604982fa0431ffb62659ab6ff22efac1e167eb6830011d62e5f86a0f2d5e8f3579eb6752592b94650414f7cd3b5d0d73279a79b212846e3b10a70e48ef6e7423 config-htc-m8.armv7 35cdbf82daef7a421a92ee3b95cc57d1c77ac62d3957bb2ea60021817381348a7c9dd4119becaae2faa8ace7e21fb40d417b9ca1c0affc46947ea52625bd9127 0001-fix-video-argb-setting.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543 psmouse_base.patch -2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch" +2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch +" diff --git a/device/testing/linux-htc-m8/config-htc-m8.armhf b/device/testing/linux-htc-m8/config-htc-m8.armv7 similarity index 99% rename from device/testing/linux-htc-m8/config-htc-m8.armhf rename to device/testing/linux-htc-m8/config-htc-m8.armv7 index 84a6db9ca..3e94be88c 100644 --- a/device/testing/linux-htc-m8/config-htc-m8.armhf +++ b/device/testing/linux-htc-m8/config-htc-m8.armv7 @@ -3593,7 +3593,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 @@ -3654,7 +3653,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