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

!4410 config: Update openeuler_defconfig base on current 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Zengkai <zhengzengkai@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PLMMVTAKBNHMNQ3YAYR4GVZ3VBBNSNRV/ 
while building arm64 & x86 kernel, ci robot complains new kconfig were
introduced, but the corresponding openeuler_defconfig is not updated.
Run 'make update_oedefconfig' to fix it.

Zheng Zengkai (2):
  config: arm64: Update openeuler_defconfig base on current source code
  config: x86: Update openeuler_defconfig base on current source code


-- 
2.20.1
 
https://gitee.com/openeuler/kernel/issues/I90KKS
https://gitee.com/openeuler/kernel/issues/I90KHC 
 
Link:https://gitee.com/openeuler/kernel/pulls/4410

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 49a22666 b6d4705a

arch/arm64/configs/openeuler_defconfig

+21 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ CONFIG_CAVIUM_TX2_ERRATUM_219=y 
CONFIG_FUJITSU_ERRATUM_010001=y

CONFIG_HISILICON_ERRATUM_161600802=y

CONFIG_HISILICON_ERRATUM_162100125=y

# CONFIG_HISILICON_ERRATUM_1980005 is not set

CONFIG_HISILICON_ERRATUM_162100602=y

CONFIG_QCOM_FALKOR_ERRATUM_1003=y

CONFIG_QCOM_FALKOR_ERRATUM_1009=y
@@ -519,6 +520,7 @@ CONFIG_ARM64_PTR_AUTH_KERNEL=y 
# ARMv8.4 architectural features

#

CONFIG_ARM64_AMU_EXTN=y

# CONFIG_ARM64_MPAM is not set

CONFIG_ARM64_TLB_RANGE=y

# end of ARMv8.4 architectural features
@@ -690,6 +692,7 @@ CONFIG_ACPI_HMAT=y 
CONFIG_HAVE_ACPI_APEI=y

CONFIG_ACPI_APEI=y

CONFIG_ACPI_APEI_GHES=y

# CONFIG_ACPI_APEI_GHES_NOTIFY_ALL_RAS_ERR is not set

CONFIG_ACPI_APEI_PCIEAER=y

CONFIG_ACPI_APEI_SEA=y

CONFIG_ACPI_APEI_MEMORY_FAILURE=y
@@ -871,6 +874,7 @@ CONFIG_MODULE_SIG_ALL=y 
CONFIG_MODULE_SIG_SHA256=y

# CONFIG_MODULE_SIG_SHA384 is not set

# CONFIG_MODULE_SIG_SHA512 is not set

# CONFIG_MODULE_SIG_SM3 is not set

CONFIG_MODULE_SIG_HASH="sha256"

CONFIG_MODULE_COMPRESS_NONE=y

# CONFIG_MODULE_COMPRESS_GZIP is not set
@@ -1101,6 +1105,7 @@ CONFIG_DEVICE_MIGRATION=y 
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y

CONFIG_ARCH_ENABLE_THP_MIGRATION=y

CONFIG_CONTIG_ALLOC=y

CONFIG_PCP_BATCH_SCALE_MAX=5

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_MMU_NOTIFIER=y

CONFIG_KSM=y
@@ -1154,6 +1159,10 @@ CONFIG_LRU_GEN=y 
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y

CONFIG_PER_VMA_LOCK=y

CONFIG_LOCK_MM_AND_FIND_VMA=y

# CONFIG_ASCEND_FEATURES is not set

# CONFIG_ASCEND_OOM is not set

# CONFIG_PAGE_CACHE_LIMIT is not set

# CONFIG_CLEAR_FREELIST_PAGE is not set

CONFIG_MEMORY_RELIABLE=y

CONFIG_DYNAMIC_POOL=y

CONFIG_ETMEM_SCAN=m
@@ -1907,6 +1916,8 @@ CONFIG_PAGE_POOL=y 
# CONFIG_PAGE_POOL_STATS is not set

CONFIG_FAILOVER=m

CONFIG_ETHTOOL_NETLINK=y

CONFIG_NETACC_BPF=y

CONFIG_NETACC_TERRACE=y



#

# Device Drivers
@@ -2592,6 +2603,7 @@ CONFIG_ATA_PIIX=m 
# CONFIG_SATA_ULI is not set

# CONFIG_SATA_VIA is not set

# CONFIG_SATA_VITESSE is not set

# CONFIG_SATA_ZHAOXIN is not set



#

# PATA SFF controllers with BMDMA
@@ -2735,6 +2747,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 
CONFIG_NET_TEAM_MODE_LOADBALANCE=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

# CONFIG_IPVLAN_L2E is not set

CONFIG_IPVLAN_L3S=y

CONFIG_IPVLAN=m

CONFIG_IPVTAP=m
@@ -5445,6 +5458,7 @@ CONFIG_FB_EFI=y 
CONFIG_FB_SIMPLE=y

CONFIG_FB_SSD1307=m

# CONFIG_FB_SM712 is not set

# CONFIG_FB_LS2K500 is not set

CONFIG_FB_CORE=y

CONFIG_FB_NOTIFY=y

# CONFIG_FIRMWARE_EDID is not set
@@ -6502,6 +6516,7 @@ CONFIG_ARM_SMMU_QCOM=y 
# CONFIG_ARM_SMMU_QCOM_DEBUG is not set

CONFIG_ARM_SMMU_V3=y

CONFIG_ARM_SMMU_V3_SVA=y

# CONFIG_ARM_SMMU_V3_PM is not set

# CONFIG_QCOM_IOMMU is not set

# CONFIG_VIRTIO_IOMMU is not set

CONFIG_SMMU_BYPASS_DEV=y
@@ -6552,6 +6567,8 @@ CONFIG_SMMU_BYPASS_DEV=y 
#

# Hisilicon SoC drivers

#

# CONFIG_HISI_HBMDEV is not set

# CONFIG_HISI_HBMCACHE is not set

CONFIG_KUNPENG_HCCS=m

# end of Hisilicon SoC drivers
@@ -7145,6 +7162,7 @@ CONFIG_NLS_UTF8=m 
CONFIG_NLS_UCS2_UTILS=m

# CONFIG_DLM is not set

CONFIG_UNICODE=y

# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set

CONFIG_IO_WQ=y

# end of File systems
@@ -7262,6 +7280,8 @@ CONFIG_LIST_HARDENED=y 


CONFIG_RANDSTRUCT_NONE=y

# end of Kernel hardening options



# CONFIG_SECURITY_BOOT_INIT is not set

# end of Security options



CONFIG_XOR_BLOCKS=m
@@ -7769,6 +7789,7 @@ CONFIG_FRAME_WARN=2048 
CONFIG_STRIP_ASM_SYMS=y

# CONFIG_READABLE_ASM is not set

# CONFIG_HEADERS_INSTALL is not set

# CONFIG_OPTIMIZE_INLINING is not set

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_SECTION_MISMATCH_WARN_ONLY=y

# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set

arch/x86/configs/openeuler_defconfig

+19 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ CONFIG_X86_VSYSCALL_EMULATION=y 
CONFIG_X86_IOPL_IOPERM=y

CONFIG_MICROCODE=y

CONFIG_MICROCODE_LATE_LOADING=y

# CONFIG_MICROCODE_LATE_FORCE_MINREV is not set

CONFIG_X86_MSR=y

CONFIG_X86_CPUID=y

CONFIG_X86_5LEVEL=y
@@ -934,6 +935,7 @@ CONFIG_MODULE_SIG_ALL=y 
CONFIG_MODULE_SIG_SHA256=y

# CONFIG_MODULE_SIG_SHA384 is not set

# CONFIG_MODULE_SIG_SHA512 is not set

# CONFIG_MODULE_SIG_SM3 is not set

CONFIG_MODULE_SIG_HASH="sha256"

CONFIG_MODULE_COMPRESS_NONE=y

# CONFIG_MODULE_COMPRESS_GZIP is not set
@@ -1112,6 +1114,7 @@ CONFIG_DEVICE_MIGRATION=y 
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y

CONFIG_ARCH_ENABLE_THP_MIGRATION=y

CONFIG_CONTIG_ALLOC=y

CONFIG_PCP_BATCH_SCALE_MAX=5

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_MMU_NOTIFIER=y

CONFIG_KSM=y
@@ -1168,6 +1171,8 @@ CONFIG_LRU_GEN=y 
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y

CONFIG_PER_VMA_LOCK=y

CONFIG_LOCK_MM_AND_FIND_VMA=y

# CONFIG_ASCEND_OOM is not set

# CONFIG_PAGE_CACHE_LIMIT is not set

CONFIG_DYNAMIC_POOL=y

CONFIG_ETMEM_SCAN=m

CONFIG_ETMEM_SWAP=m
@@ -1966,6 +1971,8 @@ CONFIG_PAGE_POOL=y 
# CONFIG_PAGE_POOL_STATS is not set

CONFIG_FAILOVER=m

CONFIG_ETHTOOL_NETLINK=y

CONFIG_NETACC_BPF=y

CONFIG_NETACC_TERRACE=y



#

# Device Drivers
@@ -2761,6 +2768,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 
CONFIG_NET_TEAM_MODE_LOADBALANCE=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

# CONFIG_IPVLAN_L2E is not set

CONFIG_IPVLAN_L3S=y

CONFIG_IPVLAN=m

CONFIG_IPVTAP=m
@@ -5657,6 +5665,7 @@ CONFIG_FB_HYPERV=m 
# CONFIG_FB_SIMPLE is not set

# CONFIG_FB_SSD1307 is not set

# CONFIG_FB_SM712 is not set

# CONFIG_FB_LS2K500 is not set

CONFIG_FB_CORE=y

CONFIG_FB_NOTIFY=y

# CONFIG_FIRMWARE_EDID is not set
@@ -8006,6 +8015,12 @@ CONFIG_INTEL_TH_PTI=m 
# CONFIG_MOST is not set

# CONFIG_PECI is not set

# CONFIG_HTE is not set



#

# CPU Inspect

#

# CONFIG_CPU_INSPECT is not set

# end of CPU Inspect

# end of Device Drivers



#
@@ -8337,6 +8352,7 @@ CONFIG_NLS_UCS2_UTILS=m 
CONFIG_DLM=m

CONFIG_DLM_DEBUG=y

CONFIG_UNICODE=y

# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set

CONFIG_IO_WQ=y

# end of File systems
@@ -8455,6 +8471,8 @@ CONFIG_LIST_HARDENED=y 


CONFIG_RANDSTRUCT_NONE=y

# end of Kernel hardening options



# CONFIG_SECURITY_BOOT_INIT is not set

# end of Security options



CONFIG_XOR_BLOCKS=m
@@ -8938,6 +8956,7 @@ CONFIG_FRAME_WARN=2048 
CONFIG_STRIP_ASM_SYMS=y

# CONFIG_READABLE_ASM is not set

# CONFIG_HEADERS_INSTALL is not set

# CONFIG_OPTIMIZE_INLINING is not set

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_SECTION_MISMATCH_WARN_ONLY=y

CONFIG_OBJTOOL=y