From ca88005b314ceceb3f32c7c7454a81d3d5e59e5d Mon Sep 17 00:00:00 2001 From: Jean Lucas Date: Fri, 15 Sep 2017 11:31:17 -0400 Subject: [PATCH] bacon: Get display output & touchscreen working (#583) - Revert to LineageOS 14.1 kernel - Enable virtual terminal - Update touchscreen settings At the moment, display output works, but only when the following is run: while [ ! ]; do cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode; done. --- .../90-android-touch-dev.rules | 2 + device/device-oneplus-bacon/APKBUILD | 12 +++--- device/device-oneplus-bacon/deviceinfo | 3 +- device/linux-oneplus-bacon/APKBUILD | 15 ++++--- .../config-oneplus-bacon.armhf | 42 +++++++++++-------- 5 files changed, 44 insertions(+), 30 deletions(-) diff --git a/device/device-oneplus-bacon/90-android-touch-dev.rules b/device/device-oneplus-bacon/90-android-touch-dev.rules index 2fb1e4783..245b84ce4 100644 --- a/device/device-oneplus-bacon/90-android-touch-dev.rules +++ b/device/device-oneplus-bacon/90-android-touch-dev.rules @@ -1,2 +1,4 @@ # udev rules file # All device names can be read from weston's logfile (/tmp/weston.log in postmarketOS) +SUBSYSTEM=="input", ATTRS{name}=="synaptics-rmi-ts", \ +ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1" diff --git a/device/device-oneplus-bacon/APKBUILD b/device/device-oneplus-bacon/APKBUILD index 80c61aea4..0fdc9c422 100644 --- a/device/device-oneplus-bacon/APKBUILD +++ b/device/device-oneplus-bacon/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-oneplus-bacon pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="OnePlus One" url="https://github.com/postmarketOS" arch="noarch" @@ -9,7 +9,7 @@ depends="linux-oneplus-bacon linux-firmware mkbootimg" makedepends="" install="" subpackages="" -source="90-android-touch-dev.rules deviceinfo" +source="deviceinfo 90-android-touch-dev.rules" options="!check" build() { @@ -17,11 +17,11 @@ build() { } package() { - install -D -m644 "$srcdir"/90-android-touch-dev.rules \ - "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo + install -D -m644 "$srcdir"/90-android-touch-dev.rules \ + "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules } -sha512sums="155aa9c8bd0e202917c7f55312eaaa189114864d89bbf7fdbdcc4fe146af3c7c781a6e76b0030046383dee823465a994d6954408248cc2f43e48af40869d6b25 90-android-touch-dev.rules -54c9a25dfbfff8381009f1e49e8b22bb89bd1decf3f9900e67f4f2c9e6b25db4715d4b72e7d9d9791d7d637971e0ac40086746d29c324ffe009b02b06a0b8a30 deviceinfo" +sha512sums="96fb5b0c88b54e755d4065bafe5ac220294234b846a0b90810aedd6ee2fef544c9382c8277b757b4108e6bb05dcca4f1c90c5290a77d9d6c730f3c542066ca69 deviceinfo +480b88b2dff7083659a524880c15c9a921d49057fce8f9d6ea876ead31d1aa61b7e5c44fd6866dcfdac7dacb98f882f426dbf6f8822f6727670fbd603f4da865 90-android-touch-dev.rules" diff --git a/device/device-oneplus-bacon/deviceinfo b/device/device-oneplus-bacon/deviceinfo index 8c140dd66..cbb514ec6 100644 --- a/device/device-oneplus-bacon/deviceinfo +++ b/device/device-oneplus-bacon/deviceinfo @@ -29,4 +29,5 @@ deviceinfo_flash_offset_base="0" deviceinfo_flash_pagesize="2048" deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug" -deviceinfo_weston_core_modules="xwayland.so" +# Weston red screen workaround (see issue #54) +deviceinfo_weston_pixman_type="2" diff --git a/device/linux-oneplus-bacon/APKBUILD b/device/linux-oneplus-bacon/APKBUILD index 9e90e8e85..126b92e3b 100644 --- a/device/linux-oneplus-bacon/APKBUILD +++ b/device/linux-oneplus-bacon/APKBUILD @@ -1,26 +1,29 @@ # APKBUILD based on linux-vanilla aport. Changes: # - add !check !tracedeps # - do not create -dev subpackage +# - add 'xz' and 'dtbtool' as build dependencies +# - add `dtbTool` build hook to generate separate 'dt.img' # # Kernel config based on: arch/arm/configs/lineageos_bacon_defconfig # Changes: # - enable loadable module support # - enable devtmpfs (needed for udev -> touch support in weston) +# - enable virtual terminal _vendor=oneplus _flavor=oneplus-bacon -_version="lineage-15.0" +_version="dd65620ba04a8c6ba0e30553c9c95388daefae02" _config="config-${_flavor}.armhf" pkgname=linux-${_flavor} pkgver=3.4.113 case $pkgver in - *.*.*) _kernver=${pkgver%.*};; + *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=3 +pkgrel=4 arch="armhf" -pkgdesc="LineageOS kernel for OnePlus One" +pkgdesc="LineageOS 14.1 kernel for OnePlus One (bacon)" url="https://github.com/LineageOS/android_kernel_oneplus_msm8974" depends="postmarketos-mkinitfs" makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev python2 xz dtbtool" @@ -121,7 +124,7 @@ package() { || return 1 } -sha512sums="3ff5e3607a9035f24f010f1ae3d30635e5eed00eeeb2b51762a1dfe48be7d245fcb13a88b045d55da136af2153648bec2ed57ee715a21b33acd3af2994deb111 linux-oneplus-bacon-lineage-15.0.tar.gz -2939fdd0d54b56d9198b5b2527c2a3c647c74f658221c60b457bb68b5f5b1c3949876ae511ef5278766cf268d69fad8b25ca30d3fb807a8221b8d11769dfcf4a config-oneplus-bacon.armhf +sha512sums="94d0048439e70b11637a7a122e8652d4e997ee413d6e54ea0aed7f2c68e137fcc19b6784dcc0dedf0b80240ba16060634b517d5865ec6c7222e4dea44d3c059a linux-oneplus-bacon-dd65620ba04a8c6ba0e30553c9c95388daefae02.tar.gz +2225f3e2f82a6294a371d5a7355470c3397aa3d31d02505623087cb8365a273388abc7771cf00a602e472e7512ff8a3c90f394f7f6900f941d9b245dc7fbf632 config-oneplus-bacon.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch" diff --git a/device/linux-oneplus-bacon/config-oneplus-bacon.armhf b/device/linux-oneplus-bacon/config-oneplus-bacon.armhf index 2cdfb1d91..8bd7744ca 100644 --- a/device/linux-oneplus-bacon/config-oneplus-bacon.armhf +++ b/device/linux-oneplus-bacon/config-oneplus-bacon.armhf @@ -42,7 +42,7 @@ CONFIG_IRQ_WORK=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-lineageos" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y @@ -87,9 +87,7 @@ CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=1 -CONFIG_RCU_BOOST_DELAY=500 +# CONFIG_RCU_BOOST is not set CONFIG_IKCONFIG=y # CONFIG_IKCONFIG_PROC is not set CONFIG_LOG_BUF_SHIFT=19 @@ -921,7 +919,7 @@ CONFIG_NF_CONNTRACK_SANE=y CONFIG_NF_CONNTRACK_TFTP=y CONFIG_NF_CT_NETLINK=y # CONFIG_NF_CT_NETLINK_TIMEOUT is not set -# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_TPROXY=y CONFIG_NETFILTER_XTABLES=y # @@ -950,6 +948,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y CONFIG_NETFILTER_XT_TARGET_NOTRACK=y # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set CONFIG_NETFILTER_XT_TARGET_TEE=y +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set # CONFIG_NETFILTER_XT_TARGET_TRACE is not set CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y @@ -986,6 +985,7 @@ CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y CONFIG_NETFILTER_XT_MATCH_POLICY=y # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_QTAGUID=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y CONFIG_NETFILTER_XT_MATCH_QUOTA2=y CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y @@ -993,6 +993,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y # CONFIG_NETFILTER_XT_MATCH_REALM is not set # CONFIG_NETFILTER_XT_MATCH_RECENT is not set # CONFIG_NETFILTER_XT_MATCH_SCTP is not set +CONFIG_NETFILTER_XT_MATCH_SOCKET=y CONFIG_NETFILTER_XT_MATCH_STATE=y CONFIG_NETFILTER_XT_MATCH_STATISTIC=y CONFIG_NETFILTER_XT_MATCH_STRING=y @@ -1015,7 +1016,8 @@ CONFIG_IP_NF_MATCH_ECN=y CONFIG_IP_NF_MATCH_RPFILTER=y CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT_SKERR=y # CONFIG_IP_NF_TARGET_ULOG is not set CONFIG_NF_NAT=y CONFIG_NF_NAT_NEEDED=y @@ -1062,7 +1064,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=y CONFIG_IP6_NF_MATCH_RT=y CONFIG_IP6_NF_TARGET_HL=y CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IP6_NF_TARGET_REJECT_SKERR=y CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y # CONFIG_IP6_NF_SECURITY is not set @@ -1766,7 +1769,12 @@ CONFIG_SERIO_LIBPS2=y # # Character devices # -# CONFIG_VT is not set +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -2554,6 +2562,12 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_LP855X is not set CONFIG_BACKLIGHT_LM3630=y + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set # CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set @@ -3100,6 +3114,7 @@ CONFIG_STAGING=y # # Speakup console speech # +# CONFIG_SPEAKUP is not set # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4_STAGING is not set # CONFIG_STAGING_MEDIA is not set @@ -3109,8 +3124,6 @@ CONFIG_STAGING=y # CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_BINDER_IPC_32BIT=y -CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" CONFIG_ASHMEM=y CONFIG_ANDROID_PERSISTENT_RAM=y CONFIG_ANDROID_RAM_CONSOLE=y @@ -3238,13 +3251,8 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_FANOTIFY is not set -CONFIG_QUOTA=y -# CONFIG_QUOTA_NETLINK_INTERFACE is not set -CONFIG_PRINT_QUOTA_WARNING=y -# CONFIG_QUOTA_DEBUG is not set -# CONFIG_QFMT_V1 is not set -# CONFIG_QFMT_V2 is not set -CONFIG_QUOTACTL=y +# CONFIG_QUOTA is not set +# CONFIG_QUOTACTL is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=y # CONFIG_CUSE is not set