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

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

Merge "defconfig: msm8953: Enable data configs for 8953"

parents 84236a3d 820b75ce

arch/arm/configs/msmcortex-perf_defconfig

+18 −1
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -83,6 +84,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -115,11 +117,13 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y 
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TEE=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y
@@ -150,13 +154,17 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y 
CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NATTYPE_MODULE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y
@@ -242,8 +250,11 @@ CONFIG_RNDIS_IPA=y 
CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_MPPE=y

CONFIG_PPP_MULTILINK=y

CONFIG_PPPOE=y

CONFIG_PPPOL2TP=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y
@@ -519,6 +530,12 @@ CONFIG_SECURITY=y 
CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

arch/arm/configs/msmcortex_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -116,11 +117,13 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y 
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TEE=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y
@@ -150,13 +153,17 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y 
CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NATTYPE_MODULE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y

arch/arm64/configs/msmcortex-perf_defconfig

+18 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -80,6 +81,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -112,11 +114,13 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y 
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TEE=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y
@@ -147,13 +151,17 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y 
CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NATTYPE_MODULE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y
@@ -240,8 +248,11 @@ CONFIG_RNDIS_IPA=y 
CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_MPPE=y

CONFIG_PPP_MULTILINK=y

CONFIG_PPPOE=y

CONFIG_PPPOL2TP=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y
@@ -572,6 +583,12 @@ CONFIG_SECURITY=y 
CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

arch/arm64/configs/msmcortex_defconfig

+18 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -80,6 +81,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -112,11 +114,13 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y 
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TEE=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y
@@ -147,13 +151,17 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y 
CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NATTYPE_MODULE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y
@@ -240,8 +248,11 @@ CONFIG_RNDIS_IPA=y 
CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_MPPE=y

CONFIG_PPP_MULTILINK=y

CONFIG_PPPOE=y

CONFIG_PPPOL2TP=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y
@@ -621,6 +632,12 @@ CONFIG_SECURITY=y 
CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y