From 9fd12510d2e11203a61a0c1d53cde9dbdd94ae63 Mon Sep 17 00:00:00 2001 From: opendata26 Date: Thu, 26 Oct 2017 19:13:18 +0100 Subject: [PATCH] sony-castor-windy: Various updates (#826) * Fix wifi nvram file * Add mesa-dri-freedreno dependency * Fix touchscreen * Add osk-sdl support --- aports/device/device-sony-castor-windy/APKBUILD | 12 ++++++------ .../{brcmfmac4339-sdio.txt => brcmfmac4335-sdio.txt} | 0 aports/device/device-sony-castor-windy/deviceinfo | 3 ++- aports/device/linux-sony-castor-windy/APKBUILD | 2 +- .../config-sony-castor-windy.armhf | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) rename aports/device/device-sony-castor-windy/{brcmfmac4339-sdio.txt => brcmfmac4335-sdio.txt} (100%) diff --git a/aports/device/device-sony-castor-windy/APKBUILD b/aports/device/device-sony-castor-windy/APKBUILD index e2c88392..a07b17c6 100644 --- a/aports/device/device-sony-castor-windy/APKBUILD +++ b/aports/device/device-sony-castor-windy/APKBUILD @@ -5,24 +5,24 @@ pkgdesc="Sony Xperia Z2 Tablet WIFI" url="https://github.com/postmarketOS" arch="noarch" license="MIT" -depends="mkbootimg linux-sony-castor-windy linux-firmware firmware-adreno" +depends="mkbootimg linux-sony-castor-windy linux-firmware mesa-dri-freedreno firmware-adreno" makedepends="" install="" subpackages="" -source="modules-load.conf deviceinfo 90-android-touch-dev.rules brcmfmac4339-sdio.txt" +source="modules-load.conf deviceinfo 90-android-touch-dev.rules brcmfmac4335-sdio.txt" options="!check" package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" - install -D -m644 "$srcdir/brcmfmac4339-sdio.txt" \ - "$pkgdir/lib/firmware/brcm/brcmfmac4339-sdio.txt" + install -D -m644 "$srcdir/brcmfmac4335-sdio.txt" \ + "$pkgdir/lib/firmware/brcm/brcmfmac4335-sdio.txt" install -D -m644 "$srcdir/90-android-touch-dev.rules" \ "$pkgdir/etc/udev/rules.d/90-android-touch-dev.rules" install -D -m644 "$srcdir"/modules-load.conf \ "$pkgdir"/etc/modules-load.d/00-${pkgname}.conf } sha512sums="d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769 modules-load.conf -a18b694fb62097935bb419e6b6d387a4b7d03f6c7014503a123b2af05d10fbd9f35161cda008e8f748386b366eb0f117470a0437d9fa02e8476fcfbb15896f46 deviceinfo +6975fcf288244f3b369f37e643a5e3b0cc845fdea421170210ed16cd18a7726b6d24fec495073ab32e08f62ee22b7841a777f412483a18315058335642e017b7 deviceinfo fa0d8b7a17509f5882424e67e66f5f562705a076a12e8d9dd9363215c858d7801216520cf25373110671958b1e1589080b097170c760d18e621849b0b9090e05 90-android-touch-dev.rules -b99a1bc0d430a261b6ab0b5ea12f2e996ab24ece6fe40ff57357697f4db976394c655a7c7a63e7c985f6356126a6b1d920eb0077817cb65ae18250f404282a68 brcmfmac4339-sdio.txt" +b99a1bc0d430a261b6ab0b5ea12f2e996ab24ece6fe40ff57357697f4db976394c655a7c7a63e7c985f6356126a6b1d920eb0077817cb65ae18250f404282a68 brcmfmac4335-sdio.txt" diff --git a/aports/device/device-sony-castor-windy/brcmfmac4339-sdio.txt b/aports/device/device-sony-castor-windy/brcmfmac4335-sdio.txt similarity index 100% rename from aports/device/device-sony-castor-windy/brcmfmac4339-sdio.txt rename to aports/device/device-sony-castor-windy/brcmfmac4335-sdio.txt diff --git a/aports/device/device-sony-castor-windy/deviceinfo b/aports/device/device-sony-castor-windy/deviceinfo index 08c7168e..2ce6c4b9 100644 --- a/aports/device/device-sony-castor-windy/deviceinfo +++ b/aports/device/device-sony-castor-windy/deviceinfo @@ -8,11 +8,12 @@ deviceinfo_date="" deviceinfo_keyboard="false" deviceinfo_nonfree="????" deviceinfo_dtb="" -deviceinfo_modules_initfs="" deviceinfo_external_disk="true" +deviceinfo_modules_initfs="rmi_core rmi_i2c rmi_spi" deviceinfo_external_disk_install="true" deviceinfo_flash_methods="fastboot" deviceinfo_arch="armhf" +deviceinfo_dev_touchscreen="/dev/input/event2" # Fastboot related deviceinfo_generate_bootimg="true" diff --git a/aports/device/linux-sony-castor-windy/APKBUILD b/aports/device/linux-sony-castor-windy/APKBUILD index 7c66687f..aececd64 100644 --- a/aports/device/linux-sony-castor-windy/APKBUILD +++ b/aports/device/linux-sony-castor-windy/APKBUILD @@ -114,6 +114,6 @@ package() { } sha512sums="42e3d7ea75a2e69a7589e74409fe43f2abdee0f4cc1fcea1b138622e3845524145e4c41343abc57d71236b1e2f59715f719845fcf5e628a6c343e9b10d06942a linux-sony-castor-windy-next.tar.gz -7a39cb11eba808c1c8450925b2a865192f02572bc2c64de362ba9d26098852f8f7ce602ba2a3c418a1b12d2359d6e5fd6d3463bb338ba3071b0c72ba7f43aad4 config-sony-castor-windy.armhf +fd1df610c222a0be9aeddd43fd322a99c2344cd9ffb993483dba10c9d0c22596d01df5071b25c1dde5ee4dd5dc242adcfeb67d28274496d9a20bc571697945c6 config-sony-castor-windy.armhf a13b17a151f732c2842df963019079cab07118fcdcdb2f2dfdfbd18571c7e2bd95a94734dc3a4eef1dae970e698f46047973efba6f355b26bf553fa6c2ac895d mmc-wifi-fix.patch d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h" diff --git a/aports/device/linux-sony-castor-windy/config-sony-castor-windy.armhf b/aports/device/linux-sony-castor-windy/config-sony-castor-windy.armhf index beb7fbdf..4a1de394 100644 --- a/aports/device/linux-sony-castor-windy/config-sony-castor-windy.armhf +++ b/aports/device/linux-sony-castor-windy/config-sony-castor-windy.armhf @@ -1648,10 +1648,10 @@ CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set -CONFIG_RMI4_CORE=y +CONFIG_RMI4_CORE=m # CONFIG_RMI4_DEBUG is not set -CONFIG_RMI4_I2C=y -CONFIG_RMI4_SPI=y +CONFIG_RMI4_I2C=m +CONFIG_RMI4_SPI=m CONFIG_RMI4_2D_SENSOR=y CONFIG_RMI4_F11=y CONFIG_RMI4_F11_PEN=y