提交 5f3f1d12 编写于 作者: Y Yang Yingliang 提交者: Xie XiuQi

Revert "config: add CONFIG_ARCH_MINI and CONFIG_ARCH_ASCEND"

ascend inclusion
category: feature
bugzilla: NA
CVE: NA

------------

It's specific code for ascend, so remove it.

This reverts commit a2931b452bf9076c9f189296bf87ae055ca0491b.
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 a3b5998d
...@@ -97,25 +97,6 @@ config ARCH_HISI ...@@ -97,25 +97,6 @@ config ARCH_HISI
help help
This enables support for Hisilicon ARMv8 SoC family This enables support for Hisilicon ARMv8 SoC family
if ARCH_HISI
menu "Hisilicon platform type"
config ARCH_ASCEND
bool "Ascend SoC Family"
def_bool n
help
This enables support for ascend only
config ARCH_MINI
bool "Hisilicon Mini SoC"
select ARCH_ASCEND
help
This enables support for Hisilicon Mini SoC
endmenu
endif
config ARCH_MEDIATEK config ARCH_MEDIATEK
bool "MediaTek SoC Family" bool "MediaTek SoC Family"
select ARM_GIC select ARM_GIC
......
...@@ -246,12 +246,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y ...@@ -246,12 +246,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_LG1K is not set # CONFIG_ARCH_LG1K is not set
CONFIG_ARCH_HISI=y CONFIG_ARCH_HISI=y
#
# Hisilicon platform type
#
CONFIG_ARCH_ASCEND=y
# CONFIG_ARCH_MINI is not set
# CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MVEBU is not set
......
...@@ -258,14 +258,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y ...@@ -258,14 +258,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_LG1K is not set # CONFIG_ARCH_LG1K is not set
CONFIG_ARCH_HISI=y CONFIG_ARCH_HISI=y
#
# Hisilicon platform type
#
# CONFIG_ARCH_ASCEND is not set
# CONFIG_ARCH_MINI is not set
# CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MVEBU is not set
......
...@@ -241,8 +241,7 @@ CONFIG_ARCH_HISI=y ...@@ -241,8 +241,7 @@ CONFIG_ARCH_HISI=y
# #
# Hisilicon platform type # Hisilicon platform type
# #
CONFIG_ARCH_ASCEND=y CONFIG_ARCH_HI1910=y
CONFIG_ARCH_MINI=y
# CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MVEBU is not set
......
...@@ -256,14 +256,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y ...@@ -256,14 +256,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_LG1K is not set # CONFIG_ARCH_LG1K is not set
CONFIG_ARCH_HISI=y CONFIG_ARCH_HISI=y
#
# Hisilicon platform type
#
# CONFIG_ARCH_ASCEND is not set
# CONFIG_ARCH_MINI is not set
# CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MVEBU is not set
......
...@@ -259,14 +259,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y ...@@ -259,14 +259,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_LG1K is not set # CONFIG_ARCH_LG1K is not set
CONFIG_ARCH_HISI=y CONFIG_ARCH_HISI=y
#
# Hisilicon platform type
#
# CONFIG_ARCH_ASCEND is not set
# CONFIG_ARCH_MINI is not set
# CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MVEBU is not set
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册