Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a4944fe authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Sync config with Android-4.14 configs"

parents e649ce87 211b719b

arch/arm64/configs/vendor/atoll-perf_defconfig

+8 −4
Original line number Diff line number Diff line
@@ -17,18 +17,17 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_RCU_NOCB_CPU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKHEADERS=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_BPF=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -39,6 +38,7 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_RD_LZ4 is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -48,7 +48,6 @@ CONFIG_PROFILING=y 
CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y
@@ -78,6 +77,7 @@ CONFIG_ARMV8_DEPRECATED=y 
CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

# CONFIG_EFI is not set
@@ -245,6 +245,7 @@ CONFIG_NET_ACT_MIRRED=y 
CONFIG_NET_ACT_SKBEDIT=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_BPF_JIT=y

CONFIG_SOCKEV_NLMCAST=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y
@@ -320,6 +321,8 @@ CONFIG_CNSS_GENL=y 
CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_ST=y
@@ -457,7 +460,6 @@ CONFIG_HID_NINTENDO=y 
CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_HID_QVR=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y
@@ -660,6 +662,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SENSORS_SSC=y
@@ -721,6 +724,7 @@ CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y 
CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_STATIC_USERMODEHELPER=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

arch/arm64/configs/vendor/atoll_defconfig

+7 −4
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_RCU_NOCB_CPU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKHEADERS=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_DEBUG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y
@@ -29,7 +29,6 @@ CONFIG_CGROUP_BPF=y 
CONFIG_CGROUP_DEBUG=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -41,6 +40,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB_FREELIST_RANDOM=y
@@ -50,7 +50,6 @@ CONFIG_KPROBES=y 
CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y
@@ -84,6 +83,7 @@ CONFIG_ARMV8_DEPRECATED=y 
CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

CONFIG_KRYO_PMU_WORKAROUND=y
@@ -253,6 +253,7 @@ CONFIG_NET_ACT_SKBEDIT=y 
CONFIG_DNS_RESOLVER=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_BPF_JIT=y

CONFIG_SOCKEV_NLMCAST=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y
@@ -330,6 +331,7 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_ST=y
@@ -472,7 +474,6 @@ CONFIG_HID_NINTENDO=y 
CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_HID_QVR=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y
@@ -690,6 +691,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SENSORS_SSC=y
@@ -809,6 +811,7 @@ CONFIG_SECURITY=y 
CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY_PAGESPAN=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_STATIC_USERMODEHELPER=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

arch/arm64/configs/vendor/sdmsteppe-perf_defconfig

+8 −4
Original line number Diff line number Diff line
@@ -16,18 +16,17 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_RCU_NOCB_CPU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKHEADERS=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_BPF=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -38,6 +37,7 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_RD_LZ4 is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -47,7 +47,6 @@ CONFIG_PROFILING=y 
CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y
@@ -73,6 +72,7 @@ CONFIG_ARMV8_DEPRECATED=y 
CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

# CONFIG_EFI is not set
@@ -240,6 +240,7 @@ CONFIG_NET_ACT_MIRRED=y 
CONFIG_NET_ACT_SKBEDIT=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_BPF_JIT=y

CONFIG_SOCKEV_NLMCAST=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y
@@ -315,6 +316,8 @@ CONFIG_CNSS_GENL=y 
CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST=y

CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
@@ -441,7 +444,6 @@ CONFIG_HID_NINTENDO=y 
CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_HID_QVR=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y
@@ -639,6 +641,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SENSORS_SSC=y

CONFIG_ESOC=y
@@ -699,6 +702,7 @@ CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y 
CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_STATIC_USERMODEHELPER=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

arch/arm64/configs/vendor/sdmsteppe_defconfig

+7 −4
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_RCU_NOCB_CPU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKHEADERS=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_DEBUG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y
@@ -28,7 +28,6 @@ CONFIG_CGROUP_BPF=y 
CONFIG_CGROUP_DEBUG=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -40,6 +39,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB_FREELIST_RANDOM=y
@@ -48,7 +48,6 @@ CONFIG_PROFILING=y 
CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y
@@ -79,6 +78,7 @@ CONFIG_ARMV8_DEPRECATED=y 
CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

CONFIG_KRYO_PMU_WORKAROUND=y
@@ -248,6 +248,7 @@ CONFIG_NET_ACT_SKBEDIT=y 
CONFIG_DNS_RESOLVER=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_BPF_JIT=y

CONFIG_SOCKEV_NLMCAST=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y
@@ -325,6 +326,7 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST=y

CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
@@ -465,7 +467,6 @@ CONFIG_HID_NINTENDO=y 
CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_HID_QVR=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y
@@ -676,6 +677,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SENSORS_SSC=y

CONFIG_ESOC=y
@@ -794,6 +796,7 @@ CONFIG_SECURITY=y 
CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY_PAGESPAN=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_STATIC_USERMODEHELPER=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

arch/arm64/configs/vendor/sm8150-perf_defconfig

+8 −4
Original line number Diff line number Diff line
@@ -17,18 +17,17 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_RCU_NOCB_CPU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKHEADERS=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_BPF=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y
@@ -39,6 +38,7 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_RD_LZ4 is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -49,7 +49,6 @@ CONFIG_CC_STACKPROTECTOR_STRONG=y 
CONFIG_REFCOUNT_FULL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y
@@ -78,6 +77,7 @@ CONFIG_ARMV8_DEPRECATED=y 
CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

# CONFIG_EFI is not set
@@ -249,6 +249,7 @@ CONFIG_QRTR=y 
CONFIG_QRTR_SMD=y

CONFIG_QRTR_MHI=y

CONFIG_QRTR_FIFO=y

CONFIG_BPF_JIT=y

CONFIG_SOCKEV_NLMCAST=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y
@@ -325,6 +326,8 @@ CONFIG_CNSS_GENL=y 
CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST=y

CONFIG_TOUCHSCREEN_SYNAPTICS_TCM=y
@@ -451,7 +454,6 @@ CONFIG_HID_PLANTRONICS=y 
CONFIG_HID_SONY=y

CONFIG_HID_QVR=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y
@@ -647,6 +649,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SENSORS_SSC=y

CONFIG_ESOC=y
@@ -709,6 +712,7 @@ CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y 
CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_STATIC_USERMODEHELPER=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y