diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/lion-rk3368_defconfig | 8 | ||||
| -rw-r--r-- | arch/arm64/configs/puma-rk3399_defconfig | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm64/configs/lion-rk3368_defconfig b/arch/arm64/configs/lion-rk3368_defconfig index 89d6819ef869..301c70be9ac7 100644 --- a/arch/arm64/configs/lion-rk3368_defconfig +++ b/arch/arm64/configs/lion-rk3368_defconfig @@ -42,13 +42,7 @@ CONFIG_PCI_MSI=y CONFIG_PCIE_ROCKCHIP=y CONFIG_PCIEPORTBUS=y CONFIG_PCIEASPM_POWERSAVE=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_CAVIUM_ERRATUM_22375 is not set -# CONFIG_CAVIUM_ERRATUM_23154 is not set +CONFIG_ARM64_ERRATUM_1024718=y CONFIG_SCHED_MC=y CONFIG_NR_CPUS=8 CONFIG_PREEMPT_VOLUNTARY=y diff --git a/arch/arm64/configs/puma-rk3399_defconfig b/arch/arm64/configs/puma-rk3399_defconfig index a977b38549a3..6f10226e4bb7 100644 --- a/arch/arm64/configs/puma-rk3399_defconfig +++ b/arch/arm64/configs/puma-rk3399_defconfig @@ -203,7 +203,6 @@ CONFIG_DM_VERITY=y CONFIG_NETDEVICES=y CONFIG_TUN=y CONFIG_VETH=y -CONFIG_VHOST_NET=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set # CONFIG_NET_VENDOR_AGERE is not set @@ -560,6 +559,7 @@ CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y +CONFIG_VHOST_NET=y CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_INFO=y @@ -583,7 +583,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_PATH=y CONFIG_SECURITY_YAMA=y -CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_ANSI_CPRNG=y |