From 30c466687bd719e72460b68f4fd2e29517666d26 Mon Sep 17 00:00:00 2001 From: Zhou Guanghui Date: Mon, 4 Nov 2019 14:43:23 +0800 Subject: [PATCH] config: add CONFIG_ARCH_MINI and CONFIG_ARCH_ASCEND ascend inclusion category: feature bugzilla: NA CVE: NA -------- add CONFIG_ARCH_MINI for Mini card; add CONFIG_ARCH_ASCEND for ascend only. [fix-v2: CONFIG_ARCH_MINI select CONFIG_ARC_ASCEND fix-v3: add this config to storage_ci_defconfig] Signed-off-by: Zhou Guanghui Signed-off-by: Lijun Fang Reviewed-by: Li Zefan 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, 51 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 393d2b524284..3ca723266089 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -97,6 +97,25 @@ 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 60a01c4a7a60..1e6f5c6b6c6b 100644 --- a/arch/arm64/configs/davinci_defconfig +++ b/arch/arm64/configs/davinci_defconfig @@ -245,6 +245,12 @@ 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 a265cda4aba4..b0791e29e384 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -258,6 +258,14 @@ 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 856a4e0165e9..0e862a051a82 100644 --- a/arch/arm64/configs/mini_defconfig +++ b/arch/arm64/configs/mini_defconfig @@ -240,7 +240,8 @@ CONFIG_ARCH_HISI=y # # Hisilicon platform type # -CONFIG_ARCH_HI1910=y +CONFIG_ARCH_ASCEND=y +CONFIG_ARCH_MINI=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 25f0d6f7a4bc..02b01c43c7f9 100644 --- a/arch/arm64/configs/storage_ci_defconfig +++ b/arch/arm64/configs/storage_ci_defconfig @@ -256,6 +256,14 @@ 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 0728e1e15602..fb7d8995119f 100644 --- a/arch/arm64/configs/syzkaller_defconfig +++ b/arch/arm64/configs/syzkaller_defconfig @@ -259,6 +259,14 @@ 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