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

!7966 [OLK-6.6] openeuler_defconfig: Modify openeuler-defconfig 

Merge Pull Request from: @ygn-ndwd-official 
 
hulk inclusion
category: feature
bugzilla: #I9RNUT:[OLK-6.6]Modify the openeulerdefconfig under arm64 and x86 architectures

The minimum set of kconfig configuartion items is different from that defined by the openEuler community.
For details about the modification and reason, see the issue.

arm64:
CONFIG_PVPANIC=y
CONFIG_PVPANIC_MMIO=m

x86:
CONFIG_RESET_CONTROLLER=y
CONFIG_PVPANIC_MMIO=m 
 
Link:https://gitee.com/openeuler/kernel/pulls/7966

 

Reviewed-by: default avatarKaitian Du <dukaitian@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents bc160a82 125855c9

arch/arm64/configs/openeuler_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -2483,7 +2483,9 @@ CONFIG_ALTERA_STAPL=m 
CONFIG_MISC_RTSX_PCI=m

CONFIG_MISC_RTSX_USB=m

CONFIG_UACCE=m

# CONFIG_PVPANIC is not set

CONFIG_PVPANIC=y

CONFIG_PVPANIC_MMIO=m

# CONFIG_PVPANIC_PCI is not set

# CONFIG_GP_PCI1XXXX is not set

# end of Misc devices

arch/x86/configs/openeuler_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -2463,7 +2463,7 @@ CONFIG_MISC_RTSX_PCI=m 
CONFIG_MISC_RTSX_USB=m

CONFIG_UACCE=m

CONFIG_PVPANIC=y

# CONFIG_PVPANIC_MMIO is not set

CONFIG_PVPANIC_MMIO=m

# CONFIG_PVPANIC_PCI is not set

# CONFIG_GP_PCI1XXXX is not set

# end of Misc devices
@@ -7978,7 +7978,9 @@ CONFIG_PWM_LPSS_PLATFORM=m 
# end of IRQ chip support



# CONFIG_IPACK_BUS is not set

# CONFIG_RESET_CONTROLLER is not set

CONFIG_RESET_CONTROLLER=y

# CONFIG_RESET_TI_SYSCON is not set

# CONFIG_RESET_TI_TPS380X is not set



#

# PHY Subsystem