From 5f3f1d121c0850bb4abdb1c917a23647101ce30b Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Fri, 15 Nov 2019 22:05:41 +0800 Subject: [PATCH] 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: Yang Yingliang --- arch/arm64/Kconfig.platforms | 19 ------------------- arch/arm64/configs/davinci_defconfig | 6 ------ arch/arm64/configs/hulk_defconfig | 8 -------- arch/arm64/configs/mini_defconfig | 3 +-- arch/arm64/configs/storage_ci_defconfig | 8 -------- arch/arm64/configs/syzkaller_defconfig | 8 -------- 6 files changed, 1 insertion(+), 51 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 3ca723266089..393d2b524284 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -97,25 +97,6 @@ config ARCH_HISI help 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 bool "MediaTek SoC Family" select ARM_GIC diff --git a/arch/arm64/configs/davinci_defconfig b/arch/arm64/configs/davinci_defconfig index 17c2c98145fb..30dd45e0361f 100644 --- a/arch/arm64/configs/davinci_defconfig +++ b/arch/arm64/configs/davinci_defconfig @@ -246,12 +246,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LG1K is not set 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_MESON is not set # CONFIG_ARCH_MVEBU is not set diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index b0791e29e384..a265cda4aba4 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -258,14 +258,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LG1K is not set 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_MESON is not set # CONFIG_ARCH_MVEBU is not set diff --git a/arch/arm64/configs/mini_defconfig b/arch/arm64/configs/mini_defconfig index 83f160925e0a..30ebf0f62753 100644 --- a/arch/arm64/configs/mini_defconfig +++ b/arch/arm64/configs/mini_defconfig @@ -241,8 +241,7 @@ CONFIG_ARCH_HISI=y # # Hisilicon platform type # -CONFIG_ARCH_ASCEND=y -CONFIG_ARCH_MINI=y +CONFIG_ARCH_HI1910=y # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MVEBU is not set diff --git a/arch/arm64/configs/storage_ci_defconfig b/arch/arm64/configs/storage_ci_defconfig index 02b01c43c7f9..25f0d6f7a4bc 100644 --- a/arch/arm64/configs/storage_ci_defconfig +++ b/arch/arm64/configs/storage_ci_defconfig @@ -256,14 +256,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LG1K is not set 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_MESON is not set # CONFIG_ARCH_MVEBU is not set diff --git a/arch/arm64/configs/syzkaller_defconfig b/arch/arm64/configs/syzkaller_defconfig index fb7d8995119f..0728e1e15602 100644 --- a/arch/arm64/configs/syzkaller_defconfig +++ b/arch/arm64/configs/syzkaller_defconfig @@ -259,14 +259,6 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_LG1K is not set 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_MESON is not set # CONFIG_ARCH_MVEBU is not set -- GitLab