From: Zheng Zengkai <zhengzengkai@huawei.com> hulk inclusion category: feature bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=52 CVE: NA ------------------------------------------------- While compiling with hulk_defconfig, configs CONFIG_ARCH_PHYTIUM and CONFIG_ARM_GIC_PHYTIUM_2500 should be set to enable support for Phytium ARMv8 S2500/FT-2500 SoC and 2-Processor server. As FT-2500 2-Processor server has 16 NUMA nodes, CONFIG_NODES_SHIFT should be updated from 3 to 4. Update these three configs for hulk_defconfig by default. Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- arch/arm64/configs/hulk_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 976074747f12d..192ae49043785 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -265,6 +265,7 @@ CONFIG_ARCH_HISI=y # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MVEBU is not set +CONFIG_ARCH_PHYTIUM=y CONFIG_ARCH_QCOM=y # CONFIG_ARCH_REALTEK is not set # CONFIG_ARCH_ROCKCHIP is not set @@ -420,7 +421,7 @@ CONFIG_HOTPLUG_CPU=y CONFIG_ARM64_ERR_RECOV=y CONFIG_MPAM=y CONFIG_NUMA=y -CONFIG_NODES_SHIFT=3 +CONFIG_NODES_SHIFT=4 CONFIG_NUMA_AWARE_SPINLOCKS=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y @@ -4736,6 +4737,7 @@ CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3_ITS_PCI=y +CONFIG_ARM_GIC_PHYTIUM_2500=y CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_ASCEND_INIT_ALL_GICR=y CONFIG_PARTITION_PERCPU=y -- 2.25.1