From db3010e0715562fb5d4534bcc6fce7fd2cb58253 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Thu, 12 Aug 2021 00:51:53 +0000
Subject: [PATCH] htc-ville: change arch from armhf to armv7 and update the
kernel
Current kernel bootlooped for me on `pmbootstrap flasher boot`.
I updated the kernel to the latest version from LineageOS [1] (branch
`cm-14.1`), copied their configuration file and updated it according
to `pmbootstrap kconfig check`. Previous kernel was from `cm-12.1`
branch.
Now it can vibrate and flash camera LED when built with
`maximum-attention` hook and booted with `pmbootstrap flasher
boot`. When built with `fbkeyboard` UI without any hooks it displays
postmarketOS logo and "boot partition not found" message which is
expected as I haven't flashed the boot partition.
[1] https://github.com/LineageOS/android_kernel_htc_msm8960
---
device/testing/device-htc-ville/APKBUILD | 10 +-
device/testing/device-htc-ville/deviceinfo | 2 +-
device/testing/firmware-htc-ville/APKBUILD | 6 +-
device/testing/linux-htc-ville/APKBUILD | 16 +-
...htc-ville.armhf => config-htc-ville.armv7} | 172 +++++++++---------
5 files changed, 105 insertions(+), 101 deletions(-)
rename device/testing/linux-htc-ville/{config-htc-ville.armhf => config-htc-ville.armv7} (97%)
diff --git a/device/testing/device-htc-ville/APKBUILD b/device/testing/device-htc-ville/APKBUILD
index 2b5838e3aeb..ba8967b6212 100644
--- a/device/testing/device-htc-ville/APKBUILD
+++ b/device/testing/device-htc-ville/APKBUILD
@@ -1,11 +1,11 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-htc-ville
pkgdesc="HTC One S"
-pkgver=1
-pkgrel=5
+pkgver=2
+pkgrel=0
url="https://postmarketos.org"
license="MIT"
-arch="armhf"
+arch="armv7"
options="!check !archcheck"
depends="postmarketos-base linux-htc-ville mkbootimg mesa-dri-swrast msm-fb-refresher"
makedepends="devicepkg-dev"
@@ -27,4 +27,6 @@ nonfree_firmware() {
}
-sha512sums="474859796b931ddfd52134a830482edeeb610b18322f445bb6ac4987f99f5ae3bd8431d8e845fddcfae0baa71be1faadb1956644cd0739e54951862471aef14b deviceinfo"
+sha512sums="
+3346de120e5aeea0774e427b0816add5cbc854264409b8f10f47cbc1b8e2afb7cbb703237994109ce733a86a59c167b7a4cc7c995ca9d8d42177edd9b85bd0e4 deviceinfo
+"
diff --git a/device/testing/device-htc-ville/deviceinfo b/device/testing/device-htc-ville/deviceinfo
index 531880fb0eb..a45f4c3e8a1 100644
--- a/device/testing/device-htc-ville/deviceinfo
+++ b/device/testing/device-htc-ville/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="htc-ville"
deviceinfo_year="2012"
deviceinfo_dtb=""
deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
# Device related
deviceinfo_chassis="handset"
diff --git a/device/testing/firmware-htc-ville/APKBUILD b/device/testing/firmware-htc-ville/APKBUILD
index 2c8ce53923a..44275d7b6b8 100644
--- a/device/testing/firmware-htc-ville/APKBUILD
+++ b/device/testing/firmware-htc-ville/APKBUILD
@@ -4,7 +4,7 @@ pkgrel=1
_commit="264fdb3e9e01c85baa487b057b149262e2df9310"
pkgdesc="Firmware files for HTC One S (htc-ville)"
url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
license="proprietary"
depends="wcnss-wlan"
source="$pkgname-$_commit.tar.gz::https://github.com/UISS-Dev-Team/android_vendor_htc_ville/archive/$_commit.tar.gz"
@@ -18,4 +18,6 @@ package() {
"$pkgdir"/lib/firmware/postmarketos/"$_i"
done
}
-sha512sums="0b03cea2effcdaa1b230e909152ea8fbe79ed3e25f70e22ec7d8797147ff2276958b328f438e49a66c07128f063477d1069e00f90a8fadd7946c58da6838d919 firmware-htc-ville-264fdb3e9e01c85baa487b057b149262e2df9310.tar.gz"
+sha512sums="
+0b03cea2effcdaa1b230e909152ea8fbe79ed3e25f70e22ec7d8797147ff2276958b328f438e49a66c07128f063477d1069e00f90a8fadd7946c58da6838d919 firmware-htc-ville-264fdb3e9e01c85baa487b057b149262e2df9310.tar.gz
+"
diff --git a/device/testing/linux-htc-ville/APKBUILD b/device/testing/linux-htc-ville/APKBUILD
index 5b0ca379be7..01e59cf4c50 100644
--- a/device/testing/linux-htc-ville/APKBUILD
+++ b/device/testing/linux-htc-ville/APKBUILD
@@ -2,10 +2,10 @@
# Kernel config based on: arch/arm/configs/ville_defconfig
pkgname=linux-htc-ville
-pkgver=3.4.110
-pkgrel=3
+pkgver=3.4.114
+pkgrel=0
pkgdesc="HTC One S kernel fork"
-arch="armhf"
+arch="armv7"
_carch="arm"
_flavor="htc-ville"
url="https://kernel.org"
@@ -15,7 +15,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
# Source
_repository="android_kernel_htc_msm8960"
-_commit="5b59c1be35a99c8913d33e68d608eee9cdef3393"
+_commit="cb121ea9e86cd51e814cb50048fd64544e672bcc"
_config="config-$_flavor.$arch"
source="
$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
@@ -43,10 +43,12 @@ package() {
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
}
-sha512sums="5f5bd1399608301dc8688bea638bdb729b5229202748769d68cabc1e4da423ae28e06f856c971a7265d053c8a46d77e0a4f71a6d57ffea13aa5f9d84e594f2d2 linux-htc-ville-5b59c1be35a99c8913d33e68d608eee9cdef3393.tar.gz
-3ac9f70a6cb201cdd544ff70d2770def3b5aa243d234d49fc46e69ac3869c26b9d6a69ed95862b4e95809a42dbc030a2aeea5f01028dd5297982b7dde613d57a config-htc-ville.armhf
+sha512sums="
+66658db2533659c233d469f2d4040b520f4e9f156dfc1ceb637b1689ad5d63a6513f584d07668eed56ff089749da802492f6945066a8e7ba3bba71ce7783fb24 linux-htc-ville-cb121ea9e86cd51e814cb50048fd64544e672bcc.tar.gz
+a8166b9a67a6a156dc9803229f95277c081ec352300ce04ff23361de4ca252b2358f57fb31bc438b73cedeacadb6eda2e9ee1643d28f3142411a3d1d0ad88086 config-htc-ville.armv7
77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch
197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch
ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 static-inline-in-ftrace.h.patch
f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543 psmouse_base.patch
-448bad436377a22c93ac401b9aecb504fe8e84b9511a3dd28f3cc125f3725cc1168ef03dee9f8f1085a9fbb7910b9e75cd25a382ccce626b427c8e27f7c17ffc kgsl_iommu_sync_lock.patch"
+448bad436377a22c93ac401b9aecb504fe8e84b9511a3dd28f3cc125f3725cc1168ef03dee9f8f1085a9fbb7910b9e75cd25a382ccce626b427c8e27f7c17ffc kgsl_iommu_sync_lock.patch
+"
diff --git a/device/testing/linux-htc-ville/config-htc-ville.armhf b/device/testing/linux-htc-ville/config-htc-ville.armv7
similarity index 97%
rename from device/testing/linux-htc-ville/config-htc-ville.armhf
rename to device/testing/linux-htc-ville/config-htc-ville.armv7
index a85e04d5b41..d423128a699 100644
--- a/device/testing/linux-htc-ville/config-htc-ville.armhf
+++ b/device/testing/linux-htc-ville/config-htc-ville.armv7
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.110 Kernel Configuration
+# Linux/arm 3.4.113 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -92,7 +92,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=17
CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
+# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
# CONFIG_CGROUP_DEVICE is not set
# CONFIG_CPUSETS is not set
@@ -108,7 +108,7 @@ CONFIG_RT_GROUP_SCHED=y
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
+CONFIG_IPC_NS=y
# CONFIG_USER_NS is not set
# CONFIG_PID_NS is not set
# CONFIG_NET_NS is not set
@@ -131,7 +131,7 @@ CONFIG_EXPERT=y
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_ALL is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
@@ -153,16 +153,17 @@ CONFIG_PERF_USE_VMALLOC=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
-CONFIG_DEBUG_PERF_USE_VMALLOC=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG is not set
CONFIG_COMPAT_BRK=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
+# CONFIG_OPROFILE is not set
CONFIG_HAVE_OPROFILE=y
CONFIG_JUMP_LABEL=y
CONFIG_HAVE_KPROBES=y
@@ -182,14 +183,13 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
#
# CONFIG_GCOV_KERNEL is not set
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
# CONFIG_MODULES is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_BSGLIB is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -393,7 +393,7 @@ CONFIG_HTC_BATT_CORE=y
CONFIG_HTC_BATT_8960=y
CONFIG_HTC_HEADSET_MGR=y
CONFIG_HTC_HEADSET_PMIC=y
-CONFIG_HTC_HEADSET_ONE_WIRE=y
+# CONFIG_HTC_HEADSET_ONE_WIRE is not set
CONFIG_HTC_WAKE_ON_VOL=y
# CONFIG_HTC_HEADSET_GPIO is not set
# CONFIG_MSM_STACKED_MEMORY is not set
@@ -432,12 +432,12 @@ CONFIG_CPU_HAS_L2_PMU=y
CONFIG_MSM_SMD=y
# CONFIG_MSM_SMD_PKG3 is not set
CONFIG_MSM_SMD_PKG4=y
-CONFIG_MSM_SMD_DEBUG=y
+# CONFIG_MSM_SMD_DEBUG is not set
CONFIG_MSM_BAM_DMUX=y
CONFIG_MSM_N_WAY_SMD=y
CONFIG_MSM_N_WAY_SMSM=y
CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
+# CONFIG_MSM_SMD_LOGGING is not set
# CONFIG_MSM_IPC_LOGGING is not set
CONFIG_MSM_SMD_NMEA=y
# CONFIG_MSM_HSIC_TTY is not set
@@ -668,7 +668,7 @@ CONFIG_ALIGNMENT_TRAP=y
CONFIG_CC_STACKPROTECTOR=y
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
-CONFIG_CP_ACCESS=y
+# CONFIG_CP_ACCESS is not set
#
# Boot options
@@ -803,7 +803,10 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_XFRM_MODE_BEET=y
# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_INET_UDP_DIAG is not set
+CONFIG_INET_DIAG_DESTROY=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -850,7 +853,7 @@ CONFIG_NETFILTER_NETLINK_LOG=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
CONFIG_NF_CONNTRACK_EVENTS=y
# CONFIG_NF_CONNTRACK_TIMEOUT is not set
# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
@@ -890,17 +893,17 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
# CONFIG_NETFILTER_XT_TARGET_CT is not set
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
+CONFIG_NETFILTER_XT_TARGET_HL=y
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
CONFIG_NETFILTER_XT_TARGET_LOG=y
CONFIG_NETFILTER_XT_TARGET_MARK=y
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TPROXY=y
+CONFIG_NETFILTER_XT_TARGET_TRACE=y
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
@@ -920,7 +923,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
CONFIG_NETFILTER_XT_MATCH_ECN=y
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+CONFIG_NETFILTER_XT_MATCH_ESP=y
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
CONFIG_NETFILTER_XT_MATCH_HELPER=y
CONFIG_NETFILTER_XT_MATCH_HL=y
@@ -948,7 +951,7 @@ CONFIG_NETFILTER_XT_MATCH_SOCKET=y
CONFIG_NETFILTER_XT_MATCH_STATE=y
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
CONFIG_NETFILTER_XT_MATCH_STRING=y
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
CONFIG_NETFILTER_XT_MATCH_TIME=y
CONFIG_NETFILTER_XT_MATCH_U32=y
# CONFIG_IP_SET is not set
@@ -959,12 +962,11 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
#
CONFIG_NF_DEFRAG_IPV4=y
CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
+CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
@@ -1003,16 +1005,16 @@ CONFIG_NF_DEFRAG_IPV6=y
CONFIG_NF_CONNTRACK_IPV6=y
# CONFIG_IP6_NF_QUEUE is not set
CONFIG_IP6_NF_IPTABLES=y
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
+CONFIG_IP6_NF_MATCH_AH=y
+CONFIG_IP6_NF_MATCH_EUI64=y
+CONFIG_IP6_NF_MATCH_FRAG=y
+CONFIG_IP6_NF_MATCH_OPTS=y
+CONFIG_IP6_NF_MATCH_HL=y
+CONFIG_IP6_NF_MATCH_IPV6HEADER=y
+CONFIG_IP6_NF_MATCH_MH=y
+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=y
# CONFIG_IP6_NF_TARGET_REJECT_SKERR is not set
@@ -1085,7 +1087,7 @@ CONFIG_NET_SCH_PRIO=y
# CONFIG_NET_SCH_MQPRIO is not set
# CONFIG_NET_SCH_CHOKE is not set
# CONFIG_NET_SCH_QFQ is not set
-CONFIG_NET_SCH_INGRESS=y
+# CONFIG_NET_SCH_INGRESS is not set
# CONFIG_NET_SCH_PLUG is not set
#
@@ -1111,10 +1113,9 @@ CONFIG_NET_EMATCH_U32=y
CONFIG_NET_EMATCH_META=y
CONFIG_NET_EMATCH_TEXT=y
CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=y
-# CONFIG_GACT_PROB is not set
-CONFIG_NET_ACT_MIRRED=y
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_MIRRED is not set
# CONFIG_NET_ACT_IPT is not set
# CONFIG_NET_ACT_NAT is not set
# CONFIG_NET_ACT_PEDIT is not set
@@ -1178,7 +1179,7 @@ CONFIG_CFG80211=y
# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_INTERNAL_REGDB=y
# CONFIG_CFG80211_WEXT is not set
CONFIG_WIRELESS_EXT_SYSFS=y
# CONFIG_LIB80211 is not set
@@ -1285,12 +1286,13 @@ CONFIG_PMIC8XXX_VIBRATOR=y
# CONFIG_TOUCHSENSE_VIBRATOR is not set
# CONFIG_PMIC8XXX_NFC is not set
# CONFIG_PMIC8XXX_UPL is not set
-# CONFIG_QSEECOM is not set
+CONFIG_QSEECOM=y
# CONFIG_QFP_FUSE is not set
# CONFIG_BU52031NVX is not set
+CONFIG_UID_CPUTIME=y
CONFIG_CABLE_DETECT_8XXX=y
CONFIG_CABLE_DETECT_ACCESSORY=y
-CONFIG_CABLE_DETECT_ACCESSORY_BY_ADC=y
+# CONFIG_CABLE_DETECT_ACCESSORY_BY_ADC is not set
# CONFIG_VP_A1028 is not set
# CONFIG_SENSORS_NFC_PN544 is not set
# CONFIG_AMP_TFA9887 is not set
@@ -1323,6 +1325,13 @@ CONFIG_CABLE_DETECT_ACCESSORY_BY_ADC=y
# CONFIG_ALTERA_STAPL is not set
# CONFIG_SLIMPORT_ANX7808 is not set
+#
+# Vadality finger printer SPI driver
+#
+# CONFIG_FPR_SPI is not set
+# CONFIG_FPR_SPI_DMA_GSBI1 is not set
+# CONFIG_FPR_SPI_DMA_GSBI5 is not set
+
#
# SCSI device support
#
@@ -1345,7 +1354,7 @@ CONFIG_CHR_DEV_SG=y
CONFIG_CHR_DEV_SCH=y
CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_LOGGING is not set
CONFIG_SCSI_SCAN_ASYNC=y
#
@@ -1463,14 +1472,14 @@ CONFIG_PHYLIB=y
CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=y
CONFIG_PPP_DEFLATE=y
-# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_FILTER=y
CONFIG_PPP_MPPE=y
# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPPOE is not set
+CONFIG_PPPOE=y
CONFIG_PPPOLAC=y
CONFIG_PPPOPNS=y
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_SYNC_TTY=y
CONFIG_SLIP=y
CONFIG_SLHC=y
CONFIG_SLIP_COMPRESSED=y
@@ -1595,7 +1604,9 @@ CONFIG_INPUT_JOYSTICK=y
# CONFIG_JOYSTICK_ZHENHUA is not set
# CONFIG_JOYSTICK_AS5011 is not set
# CONFIG_JOYSTICK_JOYDUMP is not set
-# CONFIG_JOYSTICK_XPAD is not set
+CONFIG_JOYSTICK_XPAD=y
+# CONFIG_JOYSTICK_XPAD_FF is not set
+# CONFIG_JOYSTICK_XPAD_LEDS is not set
# CONFIG_TOUCHDISC_VTD518_SHINETSU is not set
# CONFIG_INPUT_TABLET is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -1709,8 +1720,7 @@ CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_UNIX98_PTYS=y
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_GSM is not set
# CONFIG_N_SMUX is not set
@@ -1775,7 +1785,7 @@ CONFIG_HW_RANDOM_MSM=y
# CONFIG_DCC_TTY is not set
# CONFIG_RAMOOPS is not set
CONFIG_MSM_ROTATOR=y
-# CONFIG_MSM_ADSPRPC is not set
+CONFIG_MSM_ADSPRPC=y
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2123,7 +2133,7 @@ CONFIG_REGULATOR=y
# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-CONFIG_REGULATOR_GPIO=y
+# CONFIG_REGULATOR_GPIO is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ISL6271A is not set
# CONFIG_REGULATOR_MAX1586 is not set
@@ -2137,7 +2147,7 @@ CONFIG_REGULATOR_GPIO=y
# CONFIG_REGULATOR_TPS6507X is not set
# CONFIG_REGULATOR_TPS6524X is not set
CONFIG_REGULATOR_PM8XXX=y
-# CONFIG_REGULATOR_MSM_GPIO is not set
+CONFIG_REGULATOR_MSM_GPIO=y
# CONFIG_REGULATOR_STUB is not set
CONFIG_MEDIA_SUPPORT=y
@@ -2327,11 +2337,17 @@ CONFIG_RADIO_IRIS_TRANSPORT=y
# CONFIG_DRM is not set
CONFIG_ION=y
CONFIG_ION_MSM=y
-# CONFIG_MSM_KGSL is not set
+CONFIG_MSM_KGSL=y
+# CONFIG_MSM_KGSL_CFF_DUMP is not set
+# CONFIG_MSM_KGSL_PSTMRTMDMP_CP_STAT_NO_DETAIL is not set
+# CONFIG_MSM_KGSL_PSTMRTMDMP_NO_IB_DUMP is not set
+# CONFIG_MSM_KGSL_PSTMRTMDMP_RB_HEX is not set
+CONFIG_MSM_KGSL_2D=y
CONFIG_KGSL_PER_PROCESS_PAGE_TABLE=y
CONFIG_MSM_KGSL_PAGE_TABLE_SIZE=0xFFF0000
CONFIG_MSM_KGSL_PAGE_TABLE_COUNT=24
CONFIG_MSM_KGSL_MMU_PAGE_FAULT=y
+# CONFIG_MSM_KGSL_DISABLE_SHADOW_WRITES is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y
@@ -2510,9 +2526,9 @@ CONFIG_FB_MSM_HDMI_MSM_PANEL=y
# CONFIG_FB_MSM_TVOUT_PAL_M is not set
# CONFIG_FB_MSM_TVOUT_PAL_N is not set
CONFIG_FB_MSM_TVOUT_NONE=y
-CONFIG_FB_MSM_DEFAULT_DEPTH_RGB565=y
+# CONFIG_FB_MSM_DEFAULT_DEPTH_RGB565 is not set
# CONFIG_FB_MSM_DEFAULT_DEPTH_ARGB8888 is not set
-# CONFIG_FB_MSM_DEFAULT_DEPTH_RGBA8888 is not set
+CONFIG_FB_MSM_DEFAULT_DEPTH_RGBA8888=y
# CONFIG_FB_MSM_EBI2_EPSON_S1D_QVGA_PANEL is not set
# CONFIG_FB_MSM_EBI2_PANEL_DETECT is not set
# CONFIG_EXYNOS_VIDEO is not set
@@ -2746,7 +2762,7 @@ CONFIG_USB_STORAGE_ONETOUCH=y
CONFIG_USB_STORAGE_KARMA=y
CONFIG_USB_STORAGE_CYPRESS_ATACB=y
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_LIBUSUAL is not set
+CONFIG_USB_LIBUSUAL=y
#
# USB Imaging devices
@@ -2789,7 +2805,7 @@ CONFIG_USB_EHSET_TEST_FIXTURE=y
# CONFIG_USB_QCOM_IPC_BRIDGE is not set
CONFIG_USB_GADGET=y
# CONFIG_USB_GADGET_DEBUG is not set
-CONFIG_USB_GADGET_DEBUG_FILES=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
@@ -2848,9 +2864,9 @@ CONFIG_USB_MSM_OTG=y
# CONFIG_USB_MSM_ACA is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_PERF_PROFILING=y
+# CONFIG_MMC_PERF_PROFILING is not set
CONFIG_MMC_UNSAFE_RESUME=y
-# CONFIG_MMC_CLKGATE is not set
+CONFIG_MMC_CLKGATE=y
# CONFIG_MMC_EMBEDDED_SDIO is not set
CONFIG_MMC_PARANOID_SD_INIT=y
@@ -3050,11 +3066,7 @@ CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_PERSISTENT_RAM=y
CONFIG_ANDROID_RAM_CONSOLE=y
CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE=128
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE=16
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE=8
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
+# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
# CONFIG_PERSISTENT_TRACER is not set
CONFIG_ANDROID_TIMED_OUTPUT=y
@@ -3076,6 +3088,7 @@ CONFIG_PRIMA_WLAN_OKC=y
# CONFIG_PRIMA_WLAN_11AC_HIGH_TP is not set
# CONFIG_QCOM_VOWIFI_11R is not set
# CONFIG_QCOM_TDLS is not set
+# CONFIG_WLAN_FEATURE_RX_WAKELOCK is not set
#
# Qualcomm MSM specific device drivers
@@ -3141,7 +3154,7 @@ CONFIG_F2FS_FS_SECURITY=y
CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
+# CONFIG_DNOTIFY is not set
CONFIG_INOTIFY_USER=y
# CONFIG_FANOTIFY is not set
# CONFIG_QUOTA is not set
@@ -3207,22 +3220,8 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_ROOT_NFS is not set
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-# CONFIG_SUNRPC_DEBUG is not set
# CONFIG_CEPH_FS is not set
CONFIG_CIFS=y
# CONFIG_CIFS_STATS is not set
@@ -3288,7 +3287,7 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_SECTION_MISMATCH=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
# CONFIG_LOCKUP_DETECTOR is not set
@@ -3298,7 +3297,6 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_SCHEDSTATS is not set
CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_PREEMPT is not set
@@ -3330,7 +3328,7 @@ CONFIG_DEBUG_INFO=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
-CONFIG_RCU_CPU_STALL_VERBOSE=y
+# CONFIG_RCU_CPU_STALL_VERBOSE is not set
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
@@ -3349,7 +3347,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_TRACING=y
CONFIG_TRACING_SUPPORT=y
@@ -3376,7 +3374,7 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_STRICT_DEVMEM is not set
CONFIG_ARM_UNWIND=y
-CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_LL is not set
# CONFIG_PID_IN_CONTEXTIDR is not set
--
GitLab