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

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

Merge "msm8909w: defconfig: Enable XFRM and crypto configs."

parents b37554d7 04d18a44

arch/arm/configs/msm8909w-1gb-perf_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -475,7 +475,7 @@ CONFIG_SECURITY=y 
CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_GF128MUL=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_ARM_CRYPTO=y

arch/arm/configs/msm8909w-1gb_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -504,7 +504,7 @@ CONFIG_SECURITY=y 
CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_SEQIV=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_ARM_CRYPTO=y

arch/arm/configs/msm8909w-perf_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG_DESTROY=y
@@ -488,9 +488,7 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_GF128MUL=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_AES_ARM_BS=y

arch/arm/configs/msm8909w_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG_DESTROY=y
@@ -519,8 +519,7 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_AES_ARM_BS=y