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

Commit 7cd7e941 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: arm: msm: Enable config options required for VTS"

parents 1a0f88fd 6780b6ec

arch/arm64/configs/msm-auto-gvm-perf_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ CONFIG_FORCE_ALLOC_FROM_DMA_ZONE=y 
CONFIG_SECCOMP=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

# CONFIG_EFI is not set

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

CONFIG_COMPAT=y
@@ -72,6 +74,7 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -82,6 +85,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -306,7 +310,9 @@ CONFIG_USB_CONFIGFS_F_FS=y 
CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_QDSS=y
@@ -382,8 +388,11 @@ CONFIG_SCHEDSTATS=y 
# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_IPC_LOGGING=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

arch/arm64/configs/msm-auto-gvm_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ CONFIG_FORCE_ALLOC_FROM_DMA_ZONE=y 
CONFIG_SECCOMP=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

CONFIG_COMPAT=y

CONFIG_PM_AUTOSLEEP=y
@@ -60,6 +62,7 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -70,6 +73,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -298,7 +302,9 @@ CONFIG_USB_CONFIGFS_F_FS=y 
CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_QDSS=y
@@ -399,8 +405,11 @@ CONFIG_BLK_DEV_IO_TRACE=y 
CONFIG_PANIC_ON_DATA_CORRUPTION=y

CONFIG_ARM64_PTDUMP=y

CONFIG_FREE_PAGES_RDONLY=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

arch/arm64/configs/msm-auto-perf_defconfig

+9 −1
Original line number Diff line number Diff line 
CONFIG_HOTPLUG_SIZE_BITS=28

CONFIG_LOCALVERSION="-perf"

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

# CONFIG_AUDITSYSCALL is not set

CONFIG_NO_HZ=y
@@ -67,6 +66,8 @@ CONFIG_FORCE_ALLOC_FROM_DMA_ZONE=y 
CONFIG_SECCOMP=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

# CONFIG_EFI is not set

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -96,6 +97,7 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -108,6 +110,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -447,7 +450,9 @@ CONFIG_USB_CONFIGFS_F_FS=y 
CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_QDSS=y
@@ -621,9 +626,12 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_QPDI=y

CONFIG_CORESIGHT_SOURCE_DUMMY=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm64/configs/msm-auto_defconfig

+9 −1
Original line number Diff line number Diff line 
CONFIG_HOTPLUG_SIZE_BITS=28

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

# CONFIG_AUDITSYSCALL is not set

CONFIG_NO_HZ=y
@@ -65,6 +64,8 @@ CONFIG_FORCE_ALLOC_FROM_DMA_ZONE=y 
CONFIG_SECCOMP=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_CMDLINE="console=ttyAMA0"

# CONFIG_EFI is not set

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
@@ -96,6 +97,7 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -108,6 +110,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -451,7 +454,9 @@ CONFIG_USB_CONFIGFS_F_FS=y 
CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_QDSS=y
@@ -665,9 +670,12 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_QPDI=y

CONFIG_CORESIGHT_SOURCE_DUMMY=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y