Unverified Commit 9a4fe2af authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4661 [OLK-6.6] Fix gic support for Phytium S2500 

Merge Pull Request from: @liyuting 
 
Fix gic support for Phytium S2500

Kernel-issue：
https://gitee.com/open_euler/dashboard?issue_id=I8UDQQ

Fixed an error in the Kconfig.platforms file, where the previous config ARCH_PHYTIUM was incorrectly depended on ‘ARCH_NXP’ and it is now removed.

Test：
Complete dual boot, patch function verification successful 
 
Link:https://gitee.com/openeuler/kernel/pulls/4661

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarMao HongBo <maohongbo@phytium.com.cn>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 5e742fb8 dd3b7748

arch/arm64/Kconfig.platforms

+6 −6
Original line number Diff line number Diff line
@@ -218,12 +218,6 @@ config ARCH_MXC 
	  This enables support for the ARMv8 based SoCs in the

	  NXP i.MX family.



config ARCH_PHYTIUM

    bool "Phytium SoC Family"

    help

      This enables support for Phytium ARMv8 SoC family.

    select ARM_GIC_PHYTIUM_2500



config ARCH_S32

	bool "NXP S32 SoC Family"

	help
@@ -250,6 +244,12 @@ config ARCH_NPCM 
	  General support for NPCM8xx BMC (Arbel).

	  Nuvoton NPCM8xx BMC based on the Cortex A35.



config ARCH_PHYTIUM

    bool "Phytium SoC Family"

    select ARM_GIC_PHYTIUM_2500

    help

      This enables support for Phytium ARMv8 SoC family.



config ARCH_QCOM

	bool "Qualcomm Platforms"

	select GPIOLIB

arch/arm64/configs/openeuler_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ CONFIG_ARCH_HISI=y 
# CONFIG_ARCH_NXP is not set

# CONFIG_ARCH_MA35 is not set

# CONFIG_ARCH_NPCM is not set

CONFIG_ARCH_PHYTIUM=y

CONFIG_ARCH_QCOM=y

# CONFIG_ARCH_REALTEK is not set

# CONFIG_ARCH_RENESAS is not set
@@ -5423,6 +5424,7 @@ CONFIG_DRM_CIRRUS_QEMU=m 
# CONFIG_DRM_TIDSS is not set

# CONFIG_DRM_GUD is not set

# CONFIG_DRM_SSD130X is not set

CONFIG_DRM_PHYTIUM=m

# CONFIG_DRM_LEGACY is not set

CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
@@ -6665,6 +6667,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_AL_FIC is not set

CONFIG_HISILICON_IRQ_MBIGEN=y

CONFIG_IRQ_MBIGEN_ENABLE_SPI=y