diff --git a/device/testing/linux-google-crosshatch/APKBUILD b/device/testing/linux-google-crosshatch/APKBUILD index 61fbaec83..b78536b09 100644 --- a/device/testing/linux-google-crosshatch/APKBUILD +++ b/device/testing/linux-google-crosshatch/APKBUILD @@ -2,8 +2,8 @@ # Kernel config based on: arch/arm64/configs/lineageos_crosshatch_defconfig pkgname="linux-google-crosshatch" -pkgver=4.9.96 -pkgrel=1 +pkgver=4.9.200 +pkgrel=0 pkgdesc="Google Pixel 3 XL kernel fork" arch="aarch64" _carch="arm64" @@ -14,18 +14,19 @@ options="!strip !check !tracedeps" makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool openssl-dev lz4 dtc" # Source -_repository="android_kernel_google_crosshatch" -# Lineage 16.0 branch -_commit="f8cb98bcb606f94a2307f39c21dfb705fe7868d2" +_repository="android_kernel_google_msm-4.9" +# Lineage 17.1 branch +_commit="d6cae0bddcfc25ce897d43a11a4d3c5d07777831" _config="config-$_flavor.$arch" source=" $pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz $_config clk-qcom-mdss-fix-in-tree-build.patch - init-initramfs-disable-do_skip_initramfs.patch arm64-boot-disable-building-DTBO-images.patch - init-ignore-dm-parameter.patch sec_ts-disable-touchscreen-firmware-upgrade.patch + cam_sensor_io-fix-in-tree-build.patch + cam_sensor_module-add-cam_sensor_utils-to-include-path.patch + thermal-fix-build-error.patch " builddir="$srcdir/$_repository-$_commit" @@ -41,30 +42,14 @@ build() { } package() { - # kernel.release - install -D "$builddir/include/config/kernel.release" \ - "$pkgdir/usr/share/kernel/$_flavor/kernel.release" - - # zImage (find the right one) - # Pixel 3 XL uses lz4 to compress kernel. - cd "$builddir/arch/$_carch/boot" - _target="$pkgdir/boot/vmlinuz-$_flavor" - for _zimg in Image.lz4-dtb zImage-dtb Image.gz-dtb *zImage Image; do - [ -e "$_zimg" ] || continue - msg "zImage found: $_zimg" - install -Dm644 "$_zimg" "$_target" - break - done - if ! [ -e "$_target" ]; then - error "Could not find zImage in $PWD!" - return 1 - fi + KERNEL_IMAGE_NAME="Image.lz4-dtb" downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="e5f840cc4f5a1c68150d397de079db51d51943b0ed2858011ed38b834d2fdfa1f88344b3dcbe886dea2a1b5ee959d6e7b918b009762d5e06a9edf807294647e1 linux-google-crosshatch-f8cb98bcb606f94a2307f39c21dfb705fe7868d2.tar.gz -7f051d8f3515fb85178cdd930d7f2ff50130f66bb9eaf4abe54e9050291d35884809dd66676d1ff75de259f1dc4c57dea5bbb37552aa0e3fce1e2b8092b8a6ba config-google-crosshatch.aarch64 +sha512sums="e63d9c877182952aff07beeb2581dae15ae2316a24deb5bffdc633884a438ae30685d7cdd3302d275443a7d0bcd02b33d0d49461abe56995adf43e5a5636a81e linux-google-crosshatch-d6cae0bddcfc25ce897d43a11a4d3c5d07777831.tar.gz +52b99fb7bc3ed2426ef4f352c38ff768b75fbfdc0b11c1e66f94bc37463ec7da64e6fed43a68b44013b02a751dd3bc2c5b288ddec369a2f1015e4721674e322d config-google-crosshatch.aarch64 720c5856b7d1d8b3cb20f77507818b7fe1b4950d444f7ed20cb02d255987d8860d5ed293e81ea326f147af13004b524886c733123794ac62978fda13689a5189 clk-qcom-mdss-fix-in-tree-build.patch -0f536e5acd0f5e6d6774918d8e226ae1f4edc486596fc5c93a110b4eb2555e0f1281f460065928a7f7a272b886f61f7967fe60cc4952ed1f4b37143bd2a28962 init-initramfs-disable-do_skip_initramfs.patch -43b1c1bcdd653366a5d0196bf6171f67914c3c417eeba04f4f071e095e8b3191e67ec8e03b1ed1701a9a0efe5b3e134ed7fb464439e9a389aafdcf0064f20a10 arm64-boot-disable-building-DTBO-images.patch -66ac924e2619994dad71a88223d62e911cc90c20f578eb1b0544f115de8367ea9767e7955245c70699f7af040bb8c42f9fa7aff60d4638f1e568a3b3662d30a6 init-ignore-dm-parameter.patch -7c941332085c6a2372ad083400e354c61f38752c2706d07592a7ce6a72aa5d8bb9cb10521fe0c941ac4e49aa3dbd2f9473c42ed2a10ec66b1b50b65e8ad1e0a8 sec_ts-disable-touchscreen-firmware-upgrade.patch" +f175233f0cd4e5658937cf50c8535a2b9f1a0d9c7c3fb52aa54096f7733f292e1ab6c2cebadde8479980f27d9b8f7d03f98da3f8166858c8519d91de2a37f1ba arm64-boot-disable-building-DTBO-images.patch +7c941332085c6a2372ad083400e354c61f38752c2706d07592a7ce6a72aa5d8bb9cb10521fe0c941ac4e49aa3dbd2f9473c42ed2a10ec66b1b50b65e8ad1e0a8 sec_ts-disable-touchscreen-firmware-upgrade.patch +95c385ceefac59f863629ea684d5bf47a37cbc45537a5539cccb47eb57ed5544987b7a7824677c96089e8c6d867cda45e419b478654f8485b0694506afa43135 cam_sensor_io-fix-in-tree-build.patch +3003e2b6f16edb8a5d3b52a65249ddce91ba3be4bed9f6f6bc193a55f667ff5e2d4ff667af623ba7b949006f2a5e45f13e12214c9068c6bfebfb34f04d2b631b cam_sensor_module-add-cam_sensor_utils-to-include-path.patch +7bc6d7fd84750ad9244fde9e1c74dab395a827a784c984ab51d71c7e122fb13dcef9b8863a3d31322af64da94a53327af6a83c613b3b46e6c17acf1dcb7c5823 thermal-fix-build-error.patch" diff --git a/device/testing/linux-google-crosshatch/arm64-boot-disable-building-DTBO-images.patch b/device/testing/linux-google-crosshatch/arm64-boot-disable-building-DTBO-images.patch index 4d3d54399..b21368e06 100644 --- a/device/testing/linux-google-crosshatch/arm64-boot-disable-building-DTBO-images.patch +++ b/device/testing/linux-google-crosshatch/arm64-boot-disable-building-DTBO-images.patch @@ -1,6 +1,6 @@ -From 7de8975359d95634f7ce16ed115a30ba1fdc8d0e Mon Sep 17 00:00:00 2001 +From 55832681f3390b0d7868ed1156e2930672fbdd71 Mon Sep 17 00:00:00 2001 From: Zhuowei Zhang -Date: Sat, 1 Dec 2018 00:10:38 -0800 +Date: Sun, 8 Mar 2020 00:41:12 -0500 Subject: [PATCH] arm64: boot: disable building DTBO images postmarketOS doesn't flash the DTBO partition, and doesn't package @@ -10,18 +10,18 @@ the dtbo tools yet. Just don't build them. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile -index dfafe9101f78..8bb4b634a7ff 100644 +index 87c5d9dd76c1..ef52f38965d5 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile -@@ -68,7 +68,7 @@ $(obj)/Image.lz4-dtb: $(obj)/Image.lz4 $(DTB_OBJS) FORCE - $(call if_changed,cat) - +@@ -70,7 +70,7 @@ $(obj)/Image.lz4-dtb: $(obj)/Image.lz4 $(DTB_OBJS) FORCE + ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) + ifeq ($(CONFIG_BOARD_B1C1),y) $(obj)/dtbo.img: $(obj)/dts/dtboimg.cfg $(DTBO_OBJS) FORCE - $(call if_changed,mkdtimg,4096) # align dtbo.img to 4kB + # $(call if_changed,mkdtimg,4096) # align dtbo.img to 4kB - - install: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ + else + $(obj)/dtbo.img: $(obj)/dts/dtboimg-sdm670.cfg $(DTBO_OBJS) FORCE + $(call if_changed,mkdtimg,4096) # align dtbo.img to 4kB -- -2.17.1 +2.20.1 diff --git a/device/testing/linux-google-crosshatch/cam_sensor_io-fix-in-tree-build.patch b/device/testing/linux-google-crosshatch/cam_sensor_io-fix-in-tree-build.patch new file mode 100644 index 000000000..b6b5fd7e9 --- /dev/null +++ b/device/testing/linux-google-crosshatch/cam_sensor_io-fix-in-tree-build.patch @@ -0,0 +1,30 @@ +From 64c147b6a814200934cde9677ef701f639d1af03 Mon Sep 17 00:00:00 2001 +From: Zhuowei Zhang +Date: Sat, 7 Mar 2020 14:02:02 -0500 +Subject: [PATCH] cam_sensor_io: fix in-tree build + +Without this patch, I get: + +``` +drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h:20:10: fatal error: cam_cci_dev.h: No such file or directory +``` +--- + .../msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h b/drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h +index 9c3c2e310979..bfd07a41befb 100644 +--- a/drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h ++++ b/drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h +@@ -17,7 +17,7 @@ + #include + #include + #include +-#include "cam_cci_dev.h" ++#include "../cam_cci/cam_cci_dev.h" + #include "cam_sensor_io.h" + + #define I2C_POLL_TIME_MS 5 +-- +2.20.1 + diff --git a/device/testing/linux-google-crosshatch/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch b/device/testing/linux-google-crosshatch/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch new file mode 100644 index 000000000..f03b0e853 --- /dev/null +++ b/device/testing/linux-google-crosshatch/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch @@ -0,0 +1,21 @@ +From ee1dca58283c0a91c0b4ec3ba6622acc69a77ba1 Mon Sep 17 00:00:00 2001 +From: Zhuowei Zhang +Date: Sat, 7 Mar 2020 17:02:58 -0500 +Subject: [PATCH] cam_sensor_module: add cam_sensor_utils to includes + +--- + drivers/media/platform/msm/camera/cam_sensor_module/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/media/platform/msm/camera/cam_sensor_module/Makefile b/drivers/media/platform/msm/camera/cam_sensor_module/Makefile +index 2954349cbef4..4b0469139dbd 100644 +--- a/drivers/media/platform/msm/camera/cam_sensor_module/Makefile ++++ b/drivers/media/platform/msm/camera/cam_sensor_module/Makefile +@@ -9,3 +9,4 @@ obj-$(CONFIG_SPECTRA_CAMERA) += cam_flash/ + obj-$(CONFIG_SPECTRA_CAMERA) += cam_eeprom/ + obj-$(CONFIG_SPECTRA_CAMERA) += cam_ois/ + obj-$(CONFIG_CAMERA_FW_UPDATE) += cam_fw_update/ ++subdir-ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils +-- +2.20.1 + diff --git a/device/testing/linux-google-crosshatch/config-google-crosshatch.aarch64 b/device/testing/linux-google-crosshatch/config-google-crosshatch.aarch64 index 44841a952..233dd8ca8 100644 --- a/device/testing/linux-google-crosshatch/config-google-crosshatch.aarch64 +++ b/device/testing/linux-google-crosshatch/config-google-crosshatch.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.96 Kernel Configuration +# Linux/arm64 4.9.185 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-lineageos" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZ4=y @@ -108,6 +108,8 @@ CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set # # RCU Subsystem @@ -130,9 +132,9 @@ CONFIG_RCU_NOCB_CPU_ALL=y CONFIG_BUILD_BIN2C=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_BUF_SHIFT=20 # CONFIG_CONSOLE_FLUSH_ON_HOTPLUG is not set -CONFIG_LOG_CPU_MAX_BUF_SHIFT=17 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CGROUPS=y @@ -148,7 +150,9 @@ CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_SWAP_ENABLED=y -# CONFIG_BLK_CGROUP is not set +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y # CONFIG_CFS_BANDWIDTH is not set @@ -210,7 +214,7 @@ CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y # CONFIG_USERFAULTFD is not set CONFIG_PCI_QUIRKS=y -# CONFIG_MEMBARRIER is not set +CONFIG_MEMBARRIER=y CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y @@ -222,6 +226,7 @@ CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -262,16 +267,17 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y # CONFIG_GCC_PLUGINS is not set CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR_NONE is not set +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set # CONFIG_LTO is not set CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_LTO_NONE=y # CONFIG_LTO_CLANG is not set -CONFIG_ARCH_SUPPORTS_SAFESTACK=y -# CONFIG_SAFESTACK is not set +CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y +CONFIG_ROP_PROTECTION_NONE=y +# CONFIG_SHADOW_CALL_STACK is not set CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -290,7 +296,8 @@ CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_COMPAT_OLD_SIGACTION=y # CONFIG_CPU_NO_EFFICIENT_FFS is not set -# CONFIG_HAVE_ARCH_VMAP_STACK is not set +CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y # # GCOV-based kernel profiling @@ -307,15 +314,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_MODULE_SIG=y -CONFIG_MODULE_SIG_FORCE=y -CONFIG_MODULE_SIG_ALL=y -# CONFIG_MODULE_SIG_SHA1 is not set -# CONFIG_MODULE_SIG_SHA224 is not set -# CONFIG_MODULE_SIG_SHA256 is not set -# CONFIG_MODULE_SIG_SHA384 is not set -CONFIG_MODULE_SIG_SHA512=y -CONFIG_MODULE_SIG_HASH="sha512" +# CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y @@ -323,6 +322,7 @@ CONFIG_BLOCK=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_THROTTLING is not set # CONFIG_BLK_CMDLINE_PARSER is not set # @@ -357,6 +357,7 @@ CONFIG_BLK_MQ_PCI=y CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set @@ -409,6 +410,7 @@ CONFIG_ARCH_SDM845=y # CONFIG_ARCH_ZX is not set # CONFIG_ARCH_ZYNQMP is not set CONFIG_BOARD_B1C1=y +# CONFIG_BOARD_BONITO is not set # # Bus support @@ -505,11 +507,12 @@ CONFIG_MEMORY_ISOLATION=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y +CONFIG_PROCESS_RECLAIM=y CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_BOUNCE=y # CONFIG_KSM is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set @@ -522,12 +525,12 @@ CONFIG_CMA_AREAS=7 CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set # CONFIG_ZSMALLOC_STAT is not set +CONFIG_MM_EVENT_STAT=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_BALANCE_ANON_FILE_RECLAIM=y -# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_IDLE_PAGE_TRACKING=y +CONFIG_FRAME_VECTOR=y # CONFIG_FORCE_ALLOC_FROM_DMA_ZONE is not set -# CONFIG_PROCESS_RECLAIM is not set -CONFIG_VM_MAX_READAHEAD=2048 CONFIG_ARM64_DMA_USE_IOMMU=y CONFIG_ARM64_DMA_IOMMU_ALIGNMENT=9 CONFIG_SECCOMP=y @@ -539,6 +542,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_PSCI_BP_HARDENING=y +CONFIG_ARM64_SSBD=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -589,6 +593,7 @@ CONFIG_COREDUMP=y CONFIG_COMPAT=y CONFIG_KUSER_HELPERS=y CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y # CONFIG_COMPAT_VDSO is not set CONFIG_CROSS_COMPILE_ARM32="" @@ -641,7 +646,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_STAT_DETAILS is not set CONFIG_CPU_FREQ_TIMES=y @@ -655,9 +659,9 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set # CONFIG_CPU_BOOST is not set CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y @@ -683,6 +687,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_ALGO=y CONFIG_XFRM_USER=y +CONFIG_XFRM_INTERFACE=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set CONFIG_XFRM_STATISTICS=y @@ -878,10 +883,9 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set # CONFIG_NETFILTER_XT_MATCH_OSF is not set -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_POLICY=y 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 is not set @@ -1028,16 +1032,16 @@ CONFIG_NET_SCH_MULTIQ=y # CONFIG_NET_SCH_TBF is not set # CONFIG_NET_SCH_GRED is not set # CONFIG_NET_SCH_DSMARK is not set -# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_NETEM=y # CONFIG_NET_SCH_DRR is not set # CONFIG_NET_SCH_MQPRIO is not set # CONFIG_NET_SCH_CHOKE is not set # CONFIG_NET_SCH_QFQ is not set # CONFIG_NET_SCH_CODEL is not set -# CONFIG_NET_SCH_FQ_CODEL is not set +CONFIG_NET_SCH_FQ_CODEL=y # CONFIG_NET_SCH_FQ is not set # CONFIG_NET_SCH_HHF is not set -# CONFIG_NET_SCH_PIE is not set +CONFIG_NET_SCH_PIE=y CONFIG_NET_SCH_INGRESS=y # CONFIG_NET_SCH_PLUG is not set @@ -1056,7 +1060,7 @@ CONFIG_NET_CLS_U32=y # CONFIG_NET_CLS_RSVP6 is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_CGROUP is not set -# CONFIG_NET_CLS_BPF is not set +CONFIG_NET_CLS_BPF=y # CONFIG_NET_CLS_FLOWER is not set # CONFIG_NET_CLS_MATCHALL is not set CONFIG_NET_EMATCH=y @@ -1221,6 +1225,7 @@ CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y CONFIG_REGMAP_SPMI=y CONFIG_REGMAP_MMIO=y +# CONFIG_REGMAP_SWR is not set # CONFIG_AQT_REGMAP is not set # CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS is not set CONFIG_DMA_SHARED_BUFFER=y @@ -1268,12 +1273,14 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=y +CONFIG_ZRAM_WRITEBACK=y +# CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set @@ -1326,6 +1333,7 @@ CONFIG_GOOGLE_EASEL=y CONFIG_GOOGLE_EASEL_AP=y CONFIG_CS40L2X_HAPTIC=y CONFIG_ACCESS_RAMOOPS=y +CONFIG_SYSTRACE=y # CONFIG_C2PORT is not set # @@ -1463,6 +1471,8 @@ CONFIG_SCSI_UFS_QCOM=y CONFIG_SCSI_UFS_QCOM_ICE=y CONFIG_SCSI_UFSHCD_CMD_LOGGING=y CONFIG_SCSI_UFSHCD_HPB_ACTIVATE=1 +CONFIG_SCSI_UFS_IMPAIRED=y +CONFIG_SCSI_UFS_IMPAIRED_FRAGFTL=y # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_SNIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1509,11 +1519,13 @@ CONFIG_DM_REQ_CRYPT=y CONFIG_DM_UEVENT=y # CONFIG_DM_FLAKEY is not set CONFIG_DM_VERITY=y -# CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 is not set -CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1 CONFIG_DM_VERITY_FEC=y # CONFIG_DM_SWITCH is not set # CONFIG_DM_LOG_WRITES is not set +# CONFIG_DM_VERITY_AVB is not set +# CONFIG_DM_ANDROID_VERITY is not set +# CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set +# CONFIG_DM_BOW is not set # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -1553,180 +1565,7 @@ CONFIG_TUN=y # # Distributed Switch Architecture drivers # -CONFIG_ETHERNET=y -CONFIG_NET_VENDOR_3COM=y -# CONFIG_VORTEX is not set -# CONFIG_TYPHOON is not set -CONFIG_NET_VENDOR_ADAPTEC=y -# CONFIG_ADAPTEC_STARFIRE is not set -CONFIG_NET_VENDOR_AGERE=y -# CONFIG_ET131X is not set -CONFIG_NET_VENDOR_ALTEON=y -# CONFIG_ACENIC is not set -# CONFIG_ALTERA_TSE is not set -CONFIG_NET_VENDOR_AMAZON=y -CONFIG_NET_VENDOR_AMD=y -# CONFIG_AMD8111_ETH is not set -# CONFIG_PCNET32 is not set -# CONFIG_AMD_XGBE is not set -CONFIG_NET_VENDOR_ARC=y -# CONFIG_ARC_EMAC is not set -# CONFIG_EMAC_ROCKCHIP is not set -CONFIG_NET_VENDOR_ATHEROS=y -# CONFIG_ATL2 is not set -# CONFIG_ATL1 is not set -# CONFIG_ATL1E is not set -# CONFIG_ATL1C is not set -# CONFIG_ALX is not set -# CONFIG_NET_VENDOR_AURORA is not set -CONFIG_NET_CADENCE=y -# CONFIG_MACB is not set -CONFIG_NET_VENDOR_BROADCOM=y -# CONFIG_B44 is not set -# CONFIG_BCMGENET is not set -# CONFIG_BNX2 is not set -# CONFIG_CNIC is not set -# CONFIG_TIGON3 is not set -# CONFIG_BNX2X is not set -# CONFIG_SYSTEMPORT is not set -# CONFIG_BNXT is not set -CONFIG_NET_VENDOR_BROCADE=y -# CONFIG_BNA is not set -CONFIG_NET_VENDOR_CAVIUM=y -# CONFIG_THUNDER_NIC_PF is not set -# CONFIG_THUNDER_NIC_VF is not set -# CONFIG_THUNDER_NIC_BGX is not set -# CONFIG_THUNDER_NIC_RGX is not set -# CONFIG_LIQUIDIO is not set -CONFIG_NET_VENDOR_CHELSIO=y -# CONFIG_CHELSIO_T1 is not set -# CONFIG_CHELSIO_T3 is not set -# CONFIG_CHELSIO_T4 is not set -# CONFIG_CHELSIO_T4VF is not set -CONFIG_NET_VENDOR_CISCO=y -# CONFIG_ENIC is not set -# CONFIG_DNET is not set -CONFIG_NET_VENDOR_DEC=y -# CONFIG_NET_TULIP is not set -CONFIG_NET_VENDOR_DLINK=y -# CONFIG_DL2K is not set -# CONFIG_SUNDANCE is not set -CONFIG_NET_VENDOR_EMULEX=y -# CONFIG_BE2NET is not set -CONFIG_NET_VENDOR_EZCHIP=y -# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set -CONFIG_NET_VENDOR_EXAR=y -# CONFIG_S2IO is not set -# CONFIG_VXGE is not set -CONFIG_NET_VENDOR_HISILICON=y -# CONFIG_HIX5HD2_GMAC is not set -# CONFIG_HISI_FEMAC is not set -# CONFIG_HIP04_ETH is not set -# CONFIG_HNS is not set -# CONFIG_HNS_DSAF is not set -# CONFIG_HNS_ENET is not set -CONFIG_NET_VENDOR_HP=y -# CONFIG_HP100 is not set -CONFIG_NET_VENDOR_INTEL=y -# CONFIG_E100 is not set -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set -# CONFIG_IGB is not set -# CONFIG_IGBVF is not set -# CONFIG_IXGB is not set -# CONFIG_IXGBE is not set -# CONFIG_IXGBEVF is not set -# CONFIG_I40E is not set -# CONFIG_I40EVF is not set -# CONFIG_FM10K is not set -CONFIG_NET_VENDOR_I825XX=y -# CONFIG_JME is not set -CONFIG_NET_VENDOR_MARVELL=y -# CONFIG_MVMDIO is not set -# CONFIG_MVNETA_BM is not set -# CONFIG_SKGE is not set -# CONFIG_SKY2 is not set -CONFIG_NET_VENDOR_MELLANOX=y -# CONFIG_MLX4_EN is not set -# CONFIG_MLX4_CORE is not set -# CONFIG_MLX5_CORE is not set -# CONFIG_MLXSW_CORE is not set -CONFIG_NET_VENDOR_MICREL=y -# CONFIG_KS8842 is not set -# CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set -# CONFIG_KSZ884X_PCI is not set -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set -# CONFIG_ENCX24J600 is not set -CONFIG_NET_VENDOR_MYRI=y -# CONFIG_MYRI10GE is not set -# CONFIG_FEALNX is not set -CONFIG_NET_VENDOR_NATSEMI=y -# CONFIG_NATSEMI is not set -# CONFIG_NS83820 is not set -CONFIG_NET_VENDOR_NETRONOME=y -# CONFIG_NFP_NETVF is not set -CONFIG_NET_VENDOR_8390=y -# CONFIG_NE2K_PCI is not set -CONFIG_NET_VENDOR_NVIDIA=y -# CONFIG_FORCEDETH is not set -CONFIG_NET_VENDOR_OKI=y -# CONFIG_ETHOC is not set -CONFIG_NET_PACKET_ENGINE=y -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_QLA3XXX is not set -# CONFIG_QLCNIC is not set -# CONFIG_QLGE is not set -# CONFIG_NETXEN_NIC is not set -# CONFIG_QED is not set -CONFIG_NET_VENDOR_QUALCOMM=y -# CONFIG_QCA7000 is not set -# CONFIG_QCOM_EMAC is not set -CONFIG_NET_VENDOR_REALTEK=y -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set -# CONFIG_R8169 is not set -CONFIG_NET_VENDOR_RENESAS=y -CONFIG_NET_VENDOR_RDC=y -# CONFIG_R6040 is not set -CONFIG_NET_VENDOR_ROCKER=y -CONFIG_NET_VENDOR_SAMSUNG=y -# CONFIG_SXGBE_ETH is not set -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SILAN=y -# CONFIG_SC92031 is not set -CONFIG_NET_VENDOR_SIS=y -# CONFIG_SIS900 is not set -# CONFIG_SIS190 is not set -# CONFIG_SFC is not set -CONFIG_NET_VENDOR_SMSC=y -# CONFIG_SMC91X is not set -# CONFIG_EPIC100 is not set -# CONFIG_SMSC911X is not set -# CONFIG_SMSC9420 is not set -CONFIG_NET_VENDOR_STMICRO=y -# CONFIG_STMMAC_ETH is not set -CONFIG_NET_VENDOR_SUN=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -# CONFIG_NIU is not set -CONFIG_NET_VENDOR_SYNOPSYS=y -# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -CONFIG_NET_VENDOR_TEHUTI=y -# CONFIG_TEHUTI is not set -CONFIG_NET_VENDOR_TI=y -# CONFIG_TI_CPSW_ALE is not set -# CONFIG_TLAN is not set -CONFIG_NET_VENDOR_VIA=y -# CONFIG_VIA_RHINE is not set -# CONFIG_VIA_VELOCITY is not set -CONFIG_NET_VENDOR_WIZNET=y -# CONFIG_WIZNET_W5100 is not set -# CONFIG_WIZNET_W5300 is not set +# CONFIG_ETHERNET is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PHYLIB=y @@ -1792,8 +1631,8 @@ CONFIG_USB_NET_DRIVERS=y # CONFIG_USB_CATC is not set # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_RTL8152 is not set +CONFIG_USB_RTL8150=y +CONFIG_USB_RTL8152=y # CONFIG_USB_LAN78XX is not set CONFIG_USB_USBNET=y CONFIG_USB_NET_AX8817X=y @@ -1809,19 +1648,12 @@ CONFIG_USB_NET_CDC_NCM=y # CONFIG_USB_NET_SMSC75XX is not set # CONFIG_USB_NET_SMSC95XX is not set # CONFIG_USB_NET_GL620A is not set -CONFIG_USB_NET_NET1080=y +# CONFIG_USB_NET_NET1080 is not set # CONFIG_USB_NET_PLUSB is not set # CONFIG_USB_NET_MCS7830 is not set # CONFIG_USB_NET_RNDIS_HOST is not set -CONFIG_USB_NET_CDC_SUBSET_ENABLE=y -CONFIG_USB_NET_CDC_SUBSET=y -# CONFIG_USB_ALI_M5632 is not set -# CONFIG_USB_AN2720 is not set -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -# CONFIG_USB_KC2190 is not set -CONFIG_USB_NET_ZAURUS=y +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set # CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_NET_KALMIA is not set # CONFIG_USB_NET_QMI_WWAN is not set @@ -1863,6 +1695,7 @@ CONFIG_WLAN_VENDOR_TI=y CONFIG_WLAN_VENDOR_ZYDAS=y # CONFIG_USB_ZD1201 is not set # CONFIG_USB_NET_RNDIS_WLAN is not set +# CONFIG_VIRT_WIFI is not set CONFIG_WCNSS_MEM_PRE_ALLOC=y # CONFIG_CNSS2 is not set # CONFIG_CNSS is not set @@ -1870,7 +1703,7 @@ CONFIG_WCNSS_MEM_PRE_ALLOC=y CONFIG_CLD_LL_CORE=y # CONFIG_CNSS_LOGGER is not set # CONFIG_WLAN_FEATURE_RX_WAKELOCK is not set -CONFIG_WLAN_FEATURE_SARV1_TO_SARV2=y +# CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 is not set CONFIG_CNSS_UTILS=y CONFIG_CNSS_GENL=y @@ -1903,7 +1736,8 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # CONFIG_INPUT_KEYRESET is not set -# CONFIG_INPUT_KEYCOMBO is not set +CONFIG_INPUT_KEYDEBUG=y +CONFIG_INPUT_KEYCOMBO=y # # Input Device Drivers @@ -1958,15 +1792,17 @@ 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=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_v26=y -CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C_v26=y -# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_SPI_v26 is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_HID_I2C_v26 is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v26 is not set -# CONFIG_SECURE_TOUCH_SYNAPTICS_DSX_V26 is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_v26 is not set +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_v27=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C_v27=y +# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_SPI_v27 is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_HID_I2C_v27 is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v27 is not set CONFIG_TOUCHSCREEN_FTS=y CONFIG_TOUCHSCREEN_FTM4=y # CONFIG_TOUCHSCREEN_FTM4_SHOW_EVENTS is not set @@ -1987,6 +1823,7 @@ CONFIG_TOUCHSCREEN_TBN=y # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set # CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +CONFIG_TOUCHSCREEN_HEATMAP=y # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EGALAX is not set # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set @@ -2028,11 +1865,7 @@ CONFIG_TOUCHSCREEN_TBN=y # CONFIG_TOUCHSCREEN_TPS6507X is not set # CONFIG_TOUCHSCREEN_ZFORCE is not set # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set -CONFIG_TOUCHSCREEN_SYNAPTICS_DSX=y -CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=y -# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_SPI is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_HID_I2C is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX is not set # CONFIG_TOUCHSCREEN_FT5X06 is not set # CONFIG_TOUCHSCREEN_GEN_VKEYS is not set # CONFIG_TOUCHSCREEN_HIMAX_CHIPSET is not set @@ -2051,7 +1884,6 @@ CONFIG_INPUT_QPNP_POWER_ON=y # CONFIG_INPUT_GPIO_TILT_POLLED is not set # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_ATI_REMOTE2 is not set -CONFIG_INPUT_KEYCHORD=y # CONFIG_STMVL53L0X is not set # CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_KXTJ9 is not set @@ -2077,6 +1909,7 @@ CONFIG_INPUT_DRV2624_HAPTICS=y # STMicro rainbow sensor support # CONFIG_INPUT_VD6281=y +# CONFIG_FPC_FINGERPRINT is not set # # FingerprintCard fingerprint driver @@ -2116,6 +1949,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_NOZOMI is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2165,7 +1999,6 @@ CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_MSM is not set CONFIG_HW_RANDOM_MSM_LEGACY=y CONFIG_HW_RANDOM_CAVIUM=y -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # @@ -2427,6 +2260,8 @@ CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set # CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_DEBUG_REBOOT=y +# CONFIG_DEBUG_REBOOT_DEFAULT_ON is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set @@ -2632,7 +2467,7 @@ CONFIG_THERMAL_GOV_LOW_LIMITS=y CONFIG_CPU_THERMAL=y # CONFIG_CLOCK_THERMAL is not set CONFIG_DEVFREQ_THERMAL=y -# CONFIG_THERMAL_EMULATION is not set +CONFIG_THERMAL_EMULATION=y # CONFIG_QORIQ_THERMAL is not set # @@ -2769,7 +2604,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set -# CONFIG_MSM_CDC_PINCTRL is not set +CONFIG_MSM_CDC_PINCTRL=y # CONFIG_MSM_CDC_SUPPLY is not set CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set @@ -2847,6 +2682,8 @@ CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_FIXED_MINOR_RANGES=y CONFIG_V4L2_MEM2MEM_DEV=y CONFIG_VIDEOBUF2_CORE=y +CONFIG_VIDEOBUF2_MEMOPS=y +CONFIG_VIDEOBUF2_VMALLOC=y CONFIG_DVB_CORE=y CONFIG_DVB_NET=y # CONFIG_TTPCI_EEPROM is not set @@ -3354,6 +3191,8 @@ CONFIG_SND_SOC_MAX98927=y # CONFIG_SND_SOC_PCM3168A_SPI is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5514 is not set +# CONFIG_SND_SOC_RT5514_SPI is not set # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set # CONFIG_SND_SOC_RT5677_SPI is not set @@ -3418,6 +3257,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_ACRUX is not set CONFIG_HID_APPLE=y # CONFIG_HID_APPLEIR is not set +CONFIG_HID_ASUS_GAMEPAD=y # CONFIG_HID_AUREAL is not set # CONFIG_HID_BELKIN is not set # CONFIG_HID_BETOP_FF is not set @@ -3428,7 +3268,8 @@ CONFIG_HID_APPLE=y # CONFIG_HID_CMEDIA is not set # CONFIG_HID_CP2112 is not set # CONFIG_HID_CYPRESS is not set -# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_DRAGONRISE=y +# CONFIG_DRAGONRISE_FF is not set # CONFIG_HID_EMS_FF is not set CONFIG_HID_ELECOM=y # CONFIG_HID_ELO is not set @@ -3455,7 +3296,8 @@ CONFIG_HID_MICROSOFT=y CONFIG_HID_MULTITOUCH=y # CONFIG_HID_NTRIG is not set # CONFIG_HID_ORTEK is not set -# CONFIG_HID_PANTHERLORD is not set +CONFIG_HID_PANTHERLORD=y +CONFIG_PANTHERLORD_FF=y # CONFIG_HID_PENMOUNT is not set # CONFIG_HID_PETALYNX is not set # CONFIG_HID_PICOLCD is not set @@ -3464,19 +3306,21 @@ CONFIG_HID_PLANTRONICS=y # CONFIG_HID_ROCCAT is not set # CONFIG_HID_SAITEK is not set # CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set +CONFIG_HID_SONY=y +CONFIG_SONY_FF=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEELSERIES is not set # CONFIG_HID_SUNPLUS is not set # CONFIG_HID_RMI is not set -# CONFIG_HID_GREENASIA is not set +CONFIG_HID_GREENASIA=y +CONFIG_GREENASIA_FF=y # CONFIG_HID_SMARTJOYPLUS is not set # CONFIG_HID_TIVO is not set # CONFIG_HID_TOPSEED is not set # CONFIG_HID_THINGM is not set # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set -# CONFIG_HID_WIIMOTE is not set +CONFIG_HID_WIIMOTE=y # CONFIG_HID_XINMO is not set # CONFIG_HID_ZEROPLUS is not set # CONFIG_HID_ZYDACRON is not set @@ -3488,7 +3332,7 @@ CONFIG_HID_PLANTRONICS=y # CONFIG_USB_HID=y # CONFIG_HID_PID is not set -# CONFIG_USB_HIDDEV is not set +CONFIG_USB_HIDDEV=y # # I2C HID support @@ -3597,6 +3441,7 @@ CONFIG_USB_PD=y # CONFIG_USB_PD_POLICY is not set CONFIG_USB_PD_ENGINE=y CONFIG_QPNP_USB_PDPHY=y +CONFIG_LOGBUFFER=y # # USB port drivers @@ -4075,8 +3920,6 @@ CONFIG_ION=y # CONFIG_ION_DUMMY is not set CONFIG_ION_MSM=y # CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS is not set -# CONFIG_FIQ_DEBUGGER is not set -# CONFIG_FIQ_WATCHDOG is not set # CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set # CONFIG_LNET is not set @@ -4333,7 +4176,7 @@ CONFIG_QCOM_COMMAND_DB=y CONFIG_MSM_CDSP_LOADER=y CONFIG_QCOM_SMCINVOKE=y CONFIG_MSM_EVENT_TIMER=y -# CONFIG_MSM_AVTIMER is not set +CONFIG_MSM_AVTIMER=y CONFIG_MSM_PM=y # CONFIG_MSM_PM_LEGACY is not set # CONFIG_MSM_QBT1000 is not set @@ -4769,7 +4612,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXT4_FS_POSIX_ACL is not set CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_ENCRYPTION is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set @@ -4787,7 +4629,6 @@ CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y # CONFIG_F2FS_CHECK_FS is not set -CONFIG_F2FS_FS_ENCRYPTION=y CONFIG_F2FS_FS_VERITY=y # CONFIG_F2FS_FAULT_INJECTION is not set # CONFIG_FS_DAX is not set @@ -4814,7 +4655,8 @@ CONFIG_QUOTACTL=y # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=y # CONFIG_CUSE is not set -# CONFIG_OVERLAY_FS is not set +CONFIG_OVERLAY_FS=y +CONFIG_OVERLAY_FS_OVERRIDE_CREDS=y # # Caches @@ -5002,6 +4844,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_ARCH_KASAN=y # CONFIG_KASAN is not set +# CONFIG_DEBUG_REFCOUNT is not set CONFIG_ARCH_HAS_KCOV=y # CONFIG_KCOV is not set # CONFIG_DEBUG_SHIRQ is not set @@ -5018,13 +4861,14 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_WQ_WATCHDOG is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 +# CONFIG_PANIC_ON_WARN_DEFAULT_ENABLE is not set CONFIG_PANIC_TIMEOUT=1 CONFIG_SCHED_DEBUG=y CONFIG_SCHED_INFO=y # CONFIG_PANIC_ON_SCHED_BUG is not set # CONFIG_PANIC_ON_RT_THROTTLING is not set CONFIG_SCHEDSTATS=y -# CONFIG_SCHED_STACK_END_CHECK is not set +CONFIG_SCHED_STACK_END_CHECK=y # CONFIG_DEBUG_TIMEKEEPING is not set # CONFIG_DEBUG_PREEMPT is not set @@ -5137,6 +4981,7 @@ CONFIG_TRACING_EVENTS_GPIO=y # CONFIG_TEST_UDELAY is not set # CONFIG_MEMTEST is not set # CONFIG_TEST_STATIC_KEYS is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_PANIC_ON_DATA_CORRUPTION is not set CONFIG_CC_WERROR=y # CONFIG_SAMPLES is not set @@ -5159,7 +5004,6 @@ CONFIG_DEBUG_ALIGN_RODATA=y # Security options # CONFIG_KEYS=y -CONFIG_KEYS_COMPAT=y # CONFIG_PERSISTENT_KEYRINGS is not set # CONFIG_BIG_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set @@ -5211,6 +5055,7 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_NIAP_FPT_TST_EXT_11=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y @@ -5264,6 +5109,7 @@ CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_PCBC is not set CONFIG_CRYPTO_XTS=y # CONFIG_CRYPTO_KEYWRAP is not set +# CONFIG_CRYPTO_ADIANTUM is not set # # Hash modes @@ -5312,7 +5158,6 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_CHACHA20 is not set # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_SPECK is not set # CONFIG_CRYPTO_TEA is not set CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_TWOFISH_COMMON=y @@ -5325,6 +5170,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set CONFIG_CRYPTO_LZ4=y # CONFIG_CRYPTO_LZ4HC is not set +# CONFIG_CRYPTO_ZSTD is not set # # Random Number Generation @@ -5359,7 +5205,6 @@ CONFIG_PKCS7_MESSAGE_PARSER=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="certs/esl_key.pem" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set @@ -5373,7 +5218,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_CRC32_ARM64=y -# CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_BINARY_PRINTF=y # @@ -5449,3 +5293,57 @@ CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_SBITMAP=y CONFIG_QMI_ENCDEC=y # CONFIG_QMI_ENCDEC_DEBUG is not set +# CONFIG_AUDIO_EXT_CLK is not set +CONFIG_CIRRUS_SPKR_PROTECTION=y +# CONFIG_DOLBY_DS2 is not set +# CONFIG_DOLBY_LICENSE is not set +# CONFIG_DTS_EAGLE is not set +# CONFIG_DTS_SRS_TM is not set +# CONFIG_MBHC_CS_DISABLE is not set +CONFIG_MSM_ADSP_LOADER=y +CONFIG_MSM_QDSP6_APRV2_GLINK=y +CONFIG_MSM_QDSP6_NOTIFIER=y +CONFIG_MSM_QDSP6_PDR=y +CONFIG_MSM_QDSP6_SSR=y +CONFIG_MSM_QDSP6V2_CODECS=y +# CONFIG_MSM_ULTRASOUND is not set +# CONFIG_PINCTRL_LPI is not set +CONFIG_PINCTRL_WCD=y +CONFIG_QTI_PP=y +CONFIG_SND_HWDEP_ROUTING=y +# CONFIG_SND_SOC_ANALOG_CDC is not set +CONFIG_SND_SOC_CS35L36=y +CONFIG_SND_SOC_CS35L36_I2S=y +CONFIG_SND_SOC_CS35L36_TDM=y +# CONFIG_SND_SOC_DIGITAL_CDC is not set +# CONFIG_SND_SOC_EXT_CODEC is not set +# CONFIG_SND_SOC_INT_CODEC is not set +CONFIG_SND_SOC_MACHINE_SDM845=y +CONFIG_SND_SOC_MACHINE_SDM845_MAX98927=y +# CONFIG_SND_SOC_MSM_HDMI_CODEC_RX is not set +CONFIG_SND_SOC_MSM_HOSTLESS_PCM=y +CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y +# CONFIG_SND_SOC_MSM_SDW is not set +CONFIG_SND_SOC_MSM_STUB=y +CONFIG_SND_SOC_QDSP6V2=y +# CONFIG_SND_SOC_SDM660_CDC is not set +# CONFIG_SND_SOC_SDM670 is not set +CONFIG_SND_SOC_SDM845=y +# CONFIG_SND_SOC_WCD9335 is not set +CONFIG_SND_SOC_WCD934X=y +# CONFIG_SND_SOC_WCD934X_DSD is not set +# CONFIG_SND_SOC_WCD934X_MBHC is not set +CONFIG_SND_SOC_WCD9XXX_V2=y +# CONFIG_SND_SOC_WCD_CPE is not set +# CONFIG_SND_SOC_WCD_DSP_MGR is not set +# CONFIG_SND_SOC_WCD_MBHC is not set +# CONFIG_SND_SOC_WCD_MBHC_ADC is not set +# CONFIG_SND_SOC_WCD_MBHC_LEGACY is not set +CONFIG_SND_SOC_WCD_SPI=y +# CONFIG_SND_SOC_WSA881X is not set +# CONFIG_SOUNDWIRE is not set +# CONFIG_SOUNDWIRE_WCD_CTRL is not set +CONFIG_WCD9XXX_CODEC_CORE=y +CONFIG_WCD_DSP_GLINK=y +CONFIG_WCD_MICBIAS_USE_PULLUP=y +CONFIG_WCD_SPI_AC=y diff --git a/device/testing/linux-google-crosshatch/init-ignore-dm-parameter.patch b/device/testing/linux-google-crosshatch/init-ignore-dm-parameter.patch deleted file mode 100644 index 0dc6c254e..000000000 --- a/device/testing/linux-google-crosshatch/init-ignore-dm-parameter.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9eb681bb5e4166553fee08c2ff2aebae76f0e727 Mon Sep 17 00:00:00 2001 -From: Zhuowei Zhang -Date: Sat, 8 Dec 2018 00:42:49 -0800 -Subject: [PATCH] init: ignore dm= parameter - -The commit "CHROMIUM: dm: boot time specification of dm=" -(a058da83727d9f3df84c956d9b29d775a2a9d45f) added a new boot -parameter for specifying dm partitions. This breaks postmarketOS's -root partition mounting. - -Change the boot parameter to something the bootloader doesn't know -about. - -Thanks to opendata26 for figuring this out. ---- - init/do_mounts_dm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/init/do_mounts_dm.c b/init/do_mounts_dm.c -index 7760705faffe..628b6a0c66d8 100644 ---- a/init/do_mounts_dm.c -+++ b/init/do_mounts_dm.c -@@ -459,7 +459,7 @@ static void __init dm_setup_drives(void) - dm_setup_cleanup(devices); - } - --__setup("dm=", dm_setup); -+__setup("dm_IGNORE=", dm_setup); - - void __init dm_run_setup(void) - { --- -2.17.1 - diff --git a/device/testing/linux-google-crosshatch/init-initramfs-disable-do_skip_initramfs.patch b/device/testing/linux-google-crosshatch/init-initramfs-disable-do_skip_initramfs.patch deleted file mode 100644 index 25fc10e27..000000000 --- a/device/testing/linux-google-crosshatch/init-initramfs-disable-do_skip_initramfs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 75dedb7524818dfa9904417fe1e5ac0c40291d89 Mon Sep 17 00:00:00 2001 -From: Zhuowei Zhang -Date: Tue, 27 Nov 2018 14:24:17 -0800 -Subject: [PATCH 2/2] init: initramfs: disable do_skip_initramfs - -On Android devices with A/B partition scheme, the initramfs is -ignored when booting into the operating system. This breaks -postmarketOS, which requires the initramfs. - -This reverts the change so the initramfs is always used. - -Based on a patch by erfanoabdi. ---- - init/initramfs.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/init/initramfs.c b/init/initramfs.c -index bf3af10c500a..34af892143b2 100644 ---- a/init/initramfs.c -+++ b/init/initramfs.c -@@ -622,11 +622,13 @@ static int __init populate_rootfs(void) - { - char *err; - -+ /* - if (do_skip_initramfs) { - if (initrd_start) - free_initrd(); - return default_rootfs(); - } -+ */ - - err = unpack_to_rootfs(__initramfs_start, __initramfs_size); - if (err) --- -2.17.1 - diff --git a/device/testing/linux-google-crosshatch/thermal-fix-build-error.patch b/device/testing/linux-google-crosshatch/thermal-fix-build-error.patch new file mode 100644 index 000000000..966ff4c8a --- /dev/null +++ b/device/testing/linux-google-crosshatch/thermal-fix-build-error.patch @@ -0,0 +1,30 @@ +From a0cb8c6463e5945e6f5c03db1e7db06f90a73160 Mon Sep 17 00:00:00 2001 +From: Zhuowei Zhang +Date: Sat, 7 Mar 2020 22:07:45 -0500 +Subject: [PATCH] thermal: fix build error + +When building in-tree, I get: + +``` +drivers/thermal/thermal_core.c:42:10: fatal error: ../base/base.h: No such file or directory +``` +--- + drivers/thermal/thermal_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c +index 3ac29325ccbf..bb33c55b6592 100644 +--- a/drivers/thermal/thermal_core.c ++++ b/drivers/thermal/thermal_core.c +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include <../base/base.h> ++#include "../base/base.h" + + #define CREATE_TRACE_POINTS + #include +-- +2.20.1 +