diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 3ca7232660891fcaefea1b901f8217d069a2c8c3..393d2b524284e79ab4a344779089432eb4ef31bd 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 17c2c98145fb4928039c152e38b8d6078916b0a2..30dd45e0361feccf8fd5c4a120e37aec4e7d4a0a 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 b0791e29e384d4701cc60b77be6572fd289c339b..a265cda4aba47bffdfae6073b95ded6f46578c20 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 83f160925e0aca44954f4e2c2c5f622687433e3f..30ebf0f62753fc22192f27dd8fc66353f159561b 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 02b01c43c7f9c686458461303004cd830350a670..25f0d6f7a4bcb78a7848a1a880d19c729a245f21 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 fb7d8995119f6b217db65dff331982d4be5a6cd6..0728e1e156021d0cc06e6ee4da3dd2421ab2a88a 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