From 90a370c40a71348089b7a95b49f2335df3587ef3 Mon Sep 17 00:00:00 2001 From: Xiang Rui Date: Wed, 6 Nov 2019 10:56:20 +0800 Subject: [PATCH] configs: Update ascend config ascend inclusion category: bugfix bugzilla: NA CVE: NA ------------ Update min_defconfig and davinci_defconfig Signed-off-by: Xiang Rui Signed-off-by: Chen Jun Signed-off-by: Lijun Fang Reviewed-by: Li Zefan Signed-off-by: Yang Yingliang --- arch/arm64/configs/davinci_defconfig | 7 +++++-- arch/arm64/configs/mini_defconfig | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/configs/davinci_defconfig b/arch/arm64/configs/davinci_defconfig index 747d99218bab..17c2c98145fb 100644 --- a/arch/arm64/configs/davinci_defconfig +++ b/arch/arm64/configs/davinci_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.25 Kernel Configuration +# Linux/arm64 4.19.30 Kernel Configuration # # @@ -129,6 +129,7 @@ CONFIG_PROC_PID_CPUSET=y # CONFIG_CGROUP_CPUACCT is not set # CONFIG_CGROUP_PERF is not set # CONFIG_CGROUP_DEBUG is not set +# CONFIG_CGROUP_FILES is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set @@ -922,7 +923,9 @@ CONFIG_NET_PTP_CLASSIFY=y # CONFIG_BRIDGE is not set CONFIG_HAVE_NET_DSA=y # CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=y +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_ATALK is not set diff --git a/arch/arm64/configs/mini_defconfig b/arch/arm64/configs/mini_defconfig index 0e862a051a82..83f160925e0a 100644 --- a/arch/arm64/configs/mini_defconfig +++ b/arch/arm64/configs/mini_defconfig @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.25 Kernel Configuration +# Linux/arm64 4.19.30 Kernel Configuration # # -# Compiler: aarch64-linux-gnu-gcc 6.3.0 +# Compiler: aarch64-linux-gnu-gcc 7.3.0 # CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=60300 @@ -120,6 +120,7 @@ CONFIG_PROC_PID_CPUSET=y # CONFIG_CGROUP_CPUACCT is not set # CONFIG_CGROUP_PERF is not set # CONFIG_CGROUP_DEBUG is not set +# CONFIG_CGROUP_FILES is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set @@ -1586,7 +1587,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_HVC_DCC is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # @@ -2646,6 +2646,7 @@ CONFIG_PHY_XGENE=y # CONFIG_ARM_CCN is not set CONFIG_ARM_PMU=y # CONFIG_ARM_DSU_PMU is not set +CONFIG_HISI_PMU=y # CONFIG_ARM_SPE_PMU is not set CONFIG_RAS=y -- GitLab