From 2d81c5d720d4def7dc061209024cc03a7e3d6a58 Mon Sep 17 00:00:00 2001 From: Shile Zhang Date: Sat, 11 Dec 2021 09:09:10 +0800 Subject: [PATCH] anolis: configs: refresh the defconfig ANBZ: #65 Perform a 'make olddefconfig' pass over all Anolis default config files, which keeps the defconfig update to code rebase. Signed-off-by: Shile Zhang Acked-by: Joseph Qi --- arch/arm64/configs/anolis-debug_defconfig | 18 +++++++----------- arch/arm64/configs/anolis_defconfig | 18 +++++++----------- arch/x86/configs/anolis-debug_defconfig | 17 +++++++++++------ arch/x86/configs/anolis_defconfig | 17 +++++++++++------ 4 files changed, 36 insertions(+), 34 deletions(-) diff --git a/arch/arm64/configs/anolis-debug_defconfig b/arch/arm64/configs/anolis-debug_defconfig index 6b98e9235c60..74c04efad4f0 100644 --- a/arch/arm64/configs/anolis-debug_defconfig +++ b/arch/arm64/configs/anolis-debug_defconfig @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.60 Kernel Configuration +# Linux/arm64 5.10.84 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20200825 (Alibaba 10.2.1-3 2.30)" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 8.4.1 20200928 (Anolis 8.4.1-1.0.1)" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100201 -CONFIG_LD_VERSION=235000000 +CONFIG_GCC_VERSION=80401 +CONFIG_LD_VERSION=230000000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CONSTRUCTORS=y @@ -453,10 +454,8 @@ CONFIG_ARM64_CNP=y # ARMv8.3 architectural features # # CONFIG_ARM64_PTR_AUTH is not set -CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y CONFIG_AS_HAS_PAC=y -CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y # end of ARMv8.3 architectural features # @@ -471,10 +470,8 @@ CONFIG_AS_HAS_ARMV8_4=y # ARMv8.5 architectural features # # CONFIG_ARM64_BTI is not set -CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y # CONFIG_ARM64_E0PD is not set # CONFIG_ARCH_RANDOM is not set -CONFIG_ARM64_AS_HAS_MTE=y # end of ARMv8.5 architectural features CONFIG_ARM64_SVE=y @@ -483,8 +480,6 @@ CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y -CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y -CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # @@ -3801,6 +3796,7 @@ CONFIG_MFD_CORE=m # CONFIG_HTC_PASIC3 is not set # CONFIG_LPC_ICH is not set # CONFIG_LPC_SCH is not set +# CONFIG_MFD_INTEL_PMT is not set # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set @@ -3972,7 +3968,6 @@ CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC=y # CONFIG_DRM_AMD_DC_HDCP is not set -# CONFIG_DRM_AMD_DC_SI is not set # CONFIG_DEBUG_KERNEL_DC is not set # end of Display Engine Configuration @@ -5880,6 +5875,7 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m # CONFIG_CRYPTO_LIB_POLY1305 is not set # CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_LIB_SM4=y CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set diff --git a/arch/arm64/configs/anolis_defconfig b/arch/arm64/configs/anolis_defconfig index 167749857a25..c5a9754118af 100644 --- a/arch/arm64/configs/anolis_defconfig +++ b/arch/arm64/configs/anolis_defconfig @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.60 Kernel Configuration +# Linux/arm64 5.10.84 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20200825 (Alibaba 10.2.1-3 2.30)" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 8.4.1 20200928 (Anolis 8.4.1-1.0.1)" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100201 -CONFIG_LD_VERSION=235000000 +CONFIG_GCC_VERSION=80401 +CONFIG_LD_VERSION=230000000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y @@ -448,10 +449,8 @@ CONFIG_ARM64_CNP=y # ARMv8.3 architectural features # # CONFIG_ARM64_PTR_AUTH is not set -CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y CONFIG_AS_HAS_PAC=y -CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y # end of ARMv8.3 architectural features # @@ -466,10 +465,8 @@ CONFIG_AS_HAS_ARMV8_4=y # ARMv8.5 architectural features # # CONFIG_ARM64_BTI is not set -CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y # CONFIG_ARM64_E0PD is not set # CONFIG_ARCH_RANDOM is not set -CONFIG_ARM64_AS_HAS_MTE=y # end of ARMv8.5 architectural features CONFIG_ARM64_SVE=y @@ -478,8 +475,6 @@ CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y -CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y -CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # @@ -3819,6 +3814,7 @@ CONFIG_MFD_CORE=m # CONFIG_HTC_PASIC3 is not set # CONFIG_LPC_ICH is not set # CONFIG_LPC_SCH is not set +# CONFIG_MFD_INTEL_PMT is not set # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set @@ -3990,7 +3986,6 @@ CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC=y # CONFIG_DRM_AMD_DC_HDCP is not set -# CONFIG_DRM_AMD_DC_SI is not set # CONFIG_DEBUG_KERNEL_DC is not set # end of Display Engine Configuration @@ -5897,6 +5892,7 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m # CONFIG_CRYPTO_LIB_POLY1305 is not set # CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_LIB_SM4=y CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set diff --git a/arch/x86/configs/anolis-debug_defconfig b/arch/x86/configs/anolis-debug_defconfig index 99188798193e..3f6a2036dddf 100644 --- a/arch/x86/configs/anolis-debug_defconfig +++ b/arch/x86/configs/anolis-debug_defconfig @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.60 Kernel Configuration +# Linux/x86 5.10.84 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20200825 (Alibaba 10.2.1-3 2.30)" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 8.4.1 20200928 (Anolis 8.4.1-1.0.1)" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100201 -CONFIG_LD_VERSION=235000000 +CONFIG_GCC_VERSION=80401 +CONFIG_LD_VERSION=230000000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CONSTRUCTORS=y @@ -832,6 +833,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_LOCK_EVENT_COUNTS=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -1038,8 +1040,8 @@ CONFIG_HUGETEXT=y CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_KIDLED=y CONFIG_MEMSLI=y -CONFIG_DUPTEXT=y CONFIG_MAPPING_DIRTY_HELPERS=y +CONFIG_DUPTEXT=y # end of Memory Management options CONFIG_NET=y @@ -4101,6 +4103,7 @@ CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_PCI=m # CONFIG_MFD_INTEL_PMC_BXT is not set +# CONFIG_MFD_INTEL_PMT is not set # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set @@ -4278,7 +4281,6 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN=y # CONFIG_DRM_AMD_DC_DCN3_0 is not set # CONFIG_DRM_AMD_DC_HDCP is not set -# CONFIG_DRM_AMD_DC_SI is not set # CONFIG_DEBUG_KERNEL_DC is not set # end of Display Engine Configuration @@ -5115,8 +5117,11 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_ACPI=y # CONFIG_ALTERA_MSGDMA is not set CONFIG_INTEL_IDMA64=m +CONFIG_INTEL_IDXD_BUS=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD_SVM=y +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IOATDMA=m # CONFIG_PLX_DMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set diff --git a/arch/x86/configs/anolis_defconfig b/arch/x86/configs/anolis_defconfig index 260f1f22860c..fa54d4a02a45 100644 --- a/arch/x86/configs/anolis_defconfig +++ b/arch/x86/configs/anolis_defconfig @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.60 Kernel Configuration +# Linux/x86 5.10.84 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20200825 (Alibaba 10.2.1-3 2.30)" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 8.4.1 20200928 (Anolis 8.4.1-1.0.1)" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100201 -CONFIG_LD_VERSION=235000000 +CONFIG_GCC_VERSION=80401 +CONFIG_LD_VERSION=230000000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y @@ -827,6 +828,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -1037,8 +1039,8 @@ CONFIG_HUGETEXT=y CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_KIDLED=y CONFIG_MEMSLI=y -CONFIG_DUPTEXT=y CONFIG_MAPPING_DIRTY_HELPERS=y +CONFIG_DUPTEXT=y # end of Memory Management options CONFIG_NET=y @@ -4098,6 +4100,7 @@ CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_PCI=m # CONFIG_MFD_INTEL_PMC_BXT is not set +# CONFIG_MFD_INTEL_PMT is not set # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set @@ -4275,7 +4278,6 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN=y # CONFIG_DRM_AMD_DC_DCN3_0 is not set # CONFIG_DRM_AMD_DC_HDCP is not set -# CONFIG_DRM_AMD_DC_SI is not set # CONFIG_DEBUG_KERNEL_DC is not set # end of Display Engine Configuration @@ -5111,8 +5113,11 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_ACPI=y # CONFIG_ALTERA_MSGDMA is not set CONFIG_INTEL_IDMA64=m +CONFIG_INTEL_IDXD_BUS=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD_SVM=y +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IOATDMA=m # CONFIG_PLX_DMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set -- Gitee