diff options
| -rw-r--r-- | arch/arm64/configs/z2_plus_defconfig | 13 | ||||
| -rw-r--r-- | arch/arm64/configs/z2_row_defconfig | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/arch/arm64/configs/z2_plus_defconfig b/arch/arm64/configs/z2_plus_defconfig index b48bddbe0291..64fd96dda2b6 100644 --- a/arch/arm64/configs/z2_plus_defconfig +++ b/arch/arm64/configs/z2_plus_defconfig @@ -45,6 +45,16 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8996=y CONFIG_PCI=y CONFIG_PCI_MSM=y +# CONFIG_ARM64_ERRATUM_826319 is not set +# CONFIG_ARM64_ERRATUM_827319 is not set +# CONFIG_ARM64_ERRATUM_824069 is not set +# CONFIG_ARM64_ERRATUM_819472 is not set +# CONFIG_ARM64_ERRATUM_832075 is not set +# CONFIG_ARM64_ERRATUM_845719 is not set +# CONFIG_ARM64_ERRATUM_1024718 is not set +# CONFIG_CAVIUM_ERRATUM_22375 is not set +# CONFIG_CAVIUM_ERRATUM_23154 is not set +# CONFIG_CAVIUM_ERRATUM_27456 is not set CONFIG_ENABLE_FP_SIMD_SETTINGS=y CONFIG_MSM_APP_SETTINGS=y CONFIG_SCHED_MC=y @@ -90,6 +100,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_NET_IPVTI=y CONFIG_INET_ESP=y +CONFIG_INET_IPCOMP=y # CONFIG_INET_LRO is not set CONFIG_INET_UDP_DIAG=y CONFIG_INET_DIAG_DESTROY=y @@ -534,7 +545,7 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y CONFIG_MSM_MPM_OF=y CONFIG_MSM_EVENT_TIMER=y CONFIG_MSM_AVTIMER=y -CONFIG_MSM_QBT1000=y +CONFIG_MSM_KERNEL_PROTECT=y CONFIG_MSM_RPM_STATS_LOG=y CONFIG_QCOM_SMCINVOKE=y CONFIG_MEM_SHARE_QMI_SERVICE=y diff --git a/arch/arm64/configs/z2_row_defconfig b/arch/arm64/configs/z2_row_defconfig index 81c8ec809986..aea653ab9619 100644 --- a/arch/arm64/configs/z2_row_defconfig +++ b/arch/arm64/configs/z2_row_defconfig @@ -45,6 +45,16 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8996=y CONFIG_PCI=y CONFIG_PCI_MSM=y +# CONFIG_ARM64_ERRATUM_826319 is not set +# CONFIG_ARM64_ERRATUM_827319 is not set +# CONFIG_ARM64_ERRATUM_824069 is not set +# CONFIG_ARM64_ERRATUM_819472 is not set +# CONFIG_ARM64_ERRATUM_832075 is not set +# CONFIG_ARM64_ERRATUM_845719 is not set +# CONFIG_ARM64_ERRATUM_1024718 is not set +# CONFIG_CAVIUM_ERRATUM_22375 is not set +# CONFIG_CAVIUM_ERRATUM_23154 is not set +# CONFIG_CAVIUM_ERRATUM_27456 is not set CONFIG_ENABLE_FP_SIMD_SETTINGS=y CONFIG_MSM_APP_SETTINGS=y CONFIG_SCHED_MC=y @@ -90,6 +100,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_NET_IPVTI=y CONFIG_INET_ESP=y +CONFIG_INET_IPCOMP=y # CONFIG_INET_LRO is not set CONFIG_INET_UDP_DIAG=y CONFIG_INET_DIAG_DESTROY=y @@ -540,7 +551,7 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y CONFIG_MSM_MPM_OF=y CONFIG_MSM_EVENT_TIMER=y CONFIG_MSM_AVTIMER=y -CONFIG_MSM_QBT1000=y +CONFIG_MSM_KERNEL_PROTECT=y CONFIG_MSM_RPM_STATS_LOG=y CONFIG_QCOM_SMCINVOKE=y CONFIG_MEM_SHARE_QMI_SERVICE=y |