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

!2973 Add script to check & update openeuler_defconfig 

Merge Pull Request from: @zhangjialin11 
 
https://gitee.com/openeuler/kernel/issues/I8JANU

1.Revert original script and backport new script from OLK-6.6
2.update openeuler_defconfig for x86 and arm64

Jialin Zhang (3):
  Revert "kconfig: Add script to update openeuler_defconfig"
  config: update openeuler_defconfig for x86
  config: update openeuler_defconfig for arm64

Xie XiuQi (1):
  kconfig: Add script to check & update openeuler_defconfig 
 
Link:https://gitee.com/openeuler/kernel/pulls/2973

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 40541580 20c84ec2

arch/arm64/configs/openeuler_defconfig

+40 −20
Original line number Diff line number Diff line
@@ -14,6 +14,18 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_BUILD_SALT=""

CONFIG_HAVE_KERNEL_GZIP=y

CONFIG_HAVE_KERNEL_LZMA=y

CONFIG_HAVE_KERNEL_XZ=y

CONFIG_HAVE_KERNEL_LZO=y

CONFIG_HAVE_KERNEL_LZ4=y

CONFIG_HAVE_KERNEL_ZSTD=y

CONFIG_KERNEL_GZIP=y

# CONFIG_KERNEL_LZMA is not set

# CONFIG_KERNEL_XZ is not set

# CONFIG_KERNEL_LZO is not set

# CONFIG_KERNEL_LZ4 is not set

# CONFIG_KERNEL_ZSTD is not set

CONFIG_DEFAULT_INIT=""

CONFIG_DEFAULT_HOSTNAME="(none)"

CONFIG_SWAP=y
@@ -126,6 +138,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y 
# end of Scheduler features



CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y

CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y

CONFIG_ARCH_SUPPORTS_INT128=y

CONFIG_NUMA_BALANCING=y

CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -141,12 +154,12 @@ CONFIG_CGROUP_V1_WRITEBACK=y 
CONFIG_CGROUP_SCHED=y

CONFIG_QOS_SCHED=y

CONFIG_QOS_SCHED_MULTILEVEL=y

CONFIG_QOS_SCHED_DYNAMIC_AFFINITY=y

CONFIG_QOS_SCHED_SMT_EXPELLER=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_QOS_SCHED_PRIO_LB=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_QOS_SCHED_DYNAMIC_AFFINITY=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_RDMA=y

CONFIG_CGROUP_FREEZER=y
@@ -218,6 +231,7 @@ CONFIG_KALLSYMS=y 
CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_BASE_RELATIVE=y

# CONFIG_BPF_LSM is not set

# CONFIG_BPF_SCHED is not set

CONFIG_BPF_SYSCALL=y

CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y

CONFIG_BPF_JIT_ALWAYS_ON=y
@@ -361,6 +375,7 @@ CONFIG_ARM64_ERRATUM_824069=y 
CONFIG_ARM64_ERRATUM_819472=y

CONFIG_ARM64_ERRATUM_832075=y

CONFIG_ARM64_ERRATUM_834220=y

CONFIG_ARM64_ERRATUM_1742098=y

CONFIG_ARM64_ERRATUM_845719=y

CONFIG_ARM64_ERRATUM_843419=y

CONFIG_ARM64_ERRATUM_1024718=y
@@ -383,6 +398,9 @@ CONFIG_CAVIUM_TX2_ERRATUM_219=y 
CONFIG_FUJITSU_ERRATUM_010001=y

CONFIG_HISILICON_ERRATUM_161600802=y

CONFIG_HISILICON_ERRATUM_1980005=y

CONFIG_HISILICON_ERRATUM_162100801=y

CONFIG_HISILICON_ERRATUM_162100125=y

CONFIG_HISILICON_ERRATUM_162102203=y

CONFIG_QCOM_FALKOR_ERRATUM_1003=y

CONFIG_QCOM_FALKOR_ERRATUM_1009=y

CONFIG_QCOM_QDF2400_ERRATUM_0065=y
@@ -390,9 +408,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_E1041=y 
CONFIG_SOCIONEXT_SYNQUACER_PREITS=y

CONFIG_HISILICON_ERRATUM_HIP08_RU_PREFETCH=y

# CONFIG_HISILICON_HIP08_RU_PREFETCH_DEFAULT_OFF is not set

CONFIG_HISILICON_ERRATUM_162100801=y

CONFIG_HISILICON_ERRATUM_162100125=y

CONFIG_HISILICON_ERRATUM_162102203=y

# end of ARM errata workarounds via the alternatives framework



CONFIG_ARM64_4K_PAGES=y
@@ -467,7 +482,6 @@ CONFIG_SETEND_EMULATION=y 
#

CONFIG_ARM64_HW_AFDBM=y

CONFIG_ARM64_PAN=y

CONFIG_AS_HAS_LSE_ATOMICS=y

CONFIG_ARM64_LSE_ATOMICS=y

CONFIG_ARM64_USE_LSE_ATOMICS=y

CONFIG_ARM64_VHE=y
@@ -486,15 +500,12 @@ CONFIG_ARM64_CNP=y 
# ARMv8.3 architectural features

#

CONFIG_ARM64_PTR_AUTH=y

CONFIG_AS_HAS_PAC=y

CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y

# end of ARMv8.3 architectural features



#

# ARMv8.4 architectural features

#

CONFIG_ARM64_AMU_EXTN=y

CONFIG_AS_HAS_ARMV8_4=y

CONFIG_ARM64_TLB_RANGE=y

# end of ARMv8.4 architectural features
@@ -666,6 +677,8 @@ CONFIG_EFI_SOFT_RESERVE=y 
CONFIG_EFI_PARAMS_FROM_FDT=y

CONFIG_EFI_RUNTIME_WRAPPERS=y

CONFIG_EFI_GENERIC_STUB=y

CONFIG_EFI_ZBOOT=y

# CONFIG_EFI_ZBOOT_SIGNED is not set

CONFIG_EFI_ARMSTUB_DTB_LOADER=y

CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y

# CONFIG_EFI_BOOTLOADER_CONTROL is not set
@@ -1092,6 +1105,8 @@ CONFIG_HWPOISON_INJECT=m 
CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y

# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set

CONFIG_ARCH_WANTS_THP_SWAP=y

CONFIG_THP_SWAP=y

CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_MEMCG_QOS=y
@@ -1212,6 +1227,7 @@ CONFIG_INET_ESP=m 
CONFIG_INET_ESP_OFFLOAD=m

# CONFIG_INET_ESPINTCP is not set

CONFIG_INET_IPCOMP=m

CONFIG_INET_TABLE_PERTURB_ORDER=16

CONFIG_INET_XFRM_TUNNEL=m

CONFIG_INET_TUNNEL=m

CONFIG_INET_DIAG=m
@@ -1661,7 +1677,6 @@ CONFIG_HAVE_NET_DSA=y 
CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_VLAN_8021Q_MVRP=y

# CONFIG_DECNET is not set

CONFIG_LLC=m

# CONFIG_LLC2 is not set

# CONFIG_ATALK is not set
@@ -1726,14 +1741,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" 
#

CONFIG_NET_CLS=y

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_CLS_U32_PERF=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m
@@ -1930,6 +1942,7 @@ CONFIG_SOCK_VALIDATE_XMIT=y 
CONFIG_NET_SOCK_MSG=y

CONFIG_NET_DEVLINK=y

CONFIG_PAGE_POOL=y

# CONFIG_PAGE_POOL_STATS is not set

CONFIG_FAILOVER=m

CONFIG_ETHTOOL_NETLINK=y

CONFIG_HAVE_EBPF_JIT=y
@@ -2240,6 +2253,7 @@ CONFIG_CDROM=m 
CONFIG_ZRAM=m

# CONFIG_ZRAM_WRITEBACK is not set

# CONFIG_ZRAM_MEMORY_TRACKING is not set

# CONFIG_ZRAM_MULTI_COMP is not set

# CONFIG_BLK_DEV_UMEM is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
@@ -2762,7 +2776,6 @@ CONFIG_HNS3_DCB=y 
CONFIG_HNS3_HCLGEVF=m

CONFIG_HNS3_ENET=m

CONFIG_HNS3_UBL=y

CONFIG_NETWORK_MGNT=m

CONFIG_NET_VENDOR_HUAWEI=y

CONFIG_HINIC=m

CONFIG_HINIC3=m
@@ -2910,6 +2923,7 @@ CONFIG_M1600=m 
# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

CONFIG_UBL=y

CONFIG_NETWORK_MGNT=m

# CONFIG_NET_SB1000 is not set

CONFIG_PHYLIB=y

CONFIG_SWPHY=y
@@ -3322,7 +3336,6 @@ CONFIG_SERIAL_8250_NR_UARTS=32 
CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

# CONFIG_SERIAL_8250_ASPEED_VUART is not set

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_SERIAL_8250_DETECT_IRQ is not set

CONFIG_SERIAL_8250_RSA=y
@@ -4855,6 +4868,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y 
# CONFIG_DRM_VKMS is not set

CONFIG_DRM_UDL=m

CONFIG_DRM_AST=m

# CONFIG_DRM_INSPUR is not set

CONFIG_DRM_MGAG200=m

# CONFIG_DRM_RCAR_DW_HDMI is not set

# CONFIG_DRM_RCAR_LVDS is not set
@@ -4928,7 +4942,6 @@ CONFIG_DRM_PANEL_BRIDGE=y 
# CONFIG_DRM_ARCPGU is not set

CONFIG_DRM_HISI_HIBMC=m

# CONFIG_DRM_HISI_KIRIN is not set

# CONFIG_DRM_MXSFB is not set

CONFIG_DRM_CIRRUS_QEMU=m

# CONFIG_DRM_GM12U320 is not set

# CONFIG_TINYDRM_HX8357D is not set
@@ -4943,6 +4956,7 @@ CONFIG_DRM_CIRRUS_QEMU=m 
# CONFIG_DRM_LIMA is not set

# CONFIG_DRM_PANFROST is not set

# CONFIG_DRM_TIDSS is not set

# CONFIG_DRM_PHYTIUM is not set

# CONFIG_DRM_LEGACY is not set

CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
@@ -5007,6 +5021,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

# end of Frame buffer Devices



#
@@ -5829,6 +5844,7 @@ CONFIG_VIRTIO_PCI_LIB=m 
CONFIG_VIRTIO_MENU=y

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_PCI_LEGACY=y

# CONFIG_VIRTIO_VDPA is not set

# CONFIG_VIRTIO_PMEM is not set

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=m
@@ -5861,6 +5877,7 @@ CONFIG_CHROME_PLATFORMS=y 
# CONFIG_CROS_EC is not set

# CONFIG_CROS_KBD_LED_BACKLIGHT is not set

# CONFIG_MELLANOX_PLATFORM is not set

CONFIG_LOONGARCH_PLATFORM_DEVICES=y

CONFIG_HAVE_CLK=y

CONFIG_CLKDEV_LOOKUP=y

CONFIG_HAVE_CLK_PREPARE=y
@@ -5954,8 +5971,8 @@ CONFIG_ARM_SMMU=y 
CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y

CONFIG_ARM_SMMU_V3=y

CONFIG_ARM_SMMU_V3_SVA=y

CONFIG_ARM_SMMU_V3_PM=y

# CONFIG_AGENT_SMMU_ATOS is not set

CONFIG_ARM_SMMU_V3_PM=y

# CONFIG_QCOM_IOMMU is not set

# CONFIG_VIRTIO_IOMMU is not set

CONFIG_SMMU_BYPASS_DEV=y
@@ -6146,11 +6163,12 @@ CONFIG_QCOM_L3_PMU=y 
CONFIG_THUNDERX2_PMU=m

CONFIG_XGENE_PMU=y

CONFIG_ARM_SPE_PMU=y

CONFIG_ARM64_BRBE=y

CONFIG_HISI_PMU=m

CONFIG_HISI_L3T_PMU=m

CONFIG_HISI_LPDDRC_PMU=m

CONFIG_HISI_PCIE_PMU=m

CONFIG_HNS3_PMU=m

CONFIG_HISI_L3T_PMU=m

CONFIG_HISI_LPDDRC_PMU=m

# end of Performance monitor support



CONFIG_RAS=y
@@ -6241,8 +6259,8 @@ CONFIG_EXT4_FS=m 
CONFIG_EXT4_USE_FOR_EXT2=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ERROR_REPORT=y

# CONFIG_EXT4_DEBUG is not set

CONFIG_EXT4_ERROR_REPORT=y

CONFIG_EXT4_MITIGATION_FALSE_SHARING=y

CONFIG_JBD2=m

# CONFIG_JBD2_DEBUG is not set
@@ -6370,6 +6388,7 @@ CONFIG_HUGETLB_PAGE=y 
CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y

CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y

# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set

# CONFIG_DYNAMIC_HUGETLB is not set

CONFIG_MEMFD_CREATE=y

CONFIG_ARCH_HAS_GIGANTIC_PAGE=y

CONFIG_CONFIGFS_FS=y
@@ -6603,6 +6622,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y 
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y

# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set

# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set

# CONFIG_SECURITY_LANDLOCK is not set

CONFIG_INTEGRITY=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

arch/x86/configs/openeuler_defconfig

+27 −12
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ CONFIG_SPARSE_IRQ=y 


CONFIG_CLOCKSOURCE_WATCHDOG=y

CONFIG_ARCH_CLOCKSOURCE_INIT=y

CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y

CONFIG_GENERIC_TIME_VSYSCALL=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -87,6 +86,7 @@ CONFIG_CONTEXT_TRACKING=y 
# CONFIG_CONTEXT_TRACKING_FORCE is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y

# end of Timers subsystem



CONFIG_PREEMPT_NONE=y
@@ -159,12 +159,12 @@ CONFIG_CGROUP_V1_WRITEBACK=y 
CONFIG_CGROUP_SCHED=y

CONFIG_QOS_SCHED=y

CONFIG_QOS_SCHED_MULTILEVEL=y

CONFIG_QOS_SCHED_DYNAMIC_AFFINITY=y

CONFIG_QOS_SCHED_SMT_EXPELLER=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_QOS_SCHED_PRIO_LB=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_QOS_SCHED_DYNAMIC_AFFINITY=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_RDMA=y

CONFIG_CGROUP_FREEZER=y
@@ -402,6 +402,7 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=m 
CONFIG_PERF_EVENTS_INTEL_RAPL=m

CONFIG_PERF_EVENTS_INTEL_CSTATE=m

CONFIG_PERF_EVENTS_AMD_POWER=m

CONFIG_PERF_EVENTS_AMD_UNCORE=y

CONFIG_PERF_EVENTS_AMD_BRS=y

# end of Performance monitoring
@@ -413,6 +414,7 @@ CONFIG_I8K=m 
CONFIG_MICROCODE=y

CONFIG_MICROCODE_INTEL=y

CONFIG_MICROCODE_AMD=y

CONFIG_MICROCODE_HYGON=y

CONFIG_MICROCODE_OLD_INTERFACE=y

CONFIG_MICROCODE_LATE_LOADING=y

CONFIG_X86_MSR=y
@@ -509,6 +511,8 @@ CONFIG_RETHUNK=y 
CONFIG_CPU_UNRET_ENTRY=y

CONFIG_CPU_IBPB_ENTRY=y

CONFIG_CPU_IBRS_ENTRY=y

CONFIG_CPU_SRSO=y

# CONFIG_GDS_FORCE_MITIGATION is not set

CONFIG_ARCH_HAS_ADD_PAGES=y

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -572,7 +576,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m 
CONFIG_ACPI_THERMAL=y

CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y

CONFIG_ACPI_TABLE_UPGRADE=y

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_DEBUG=y

CONFIG_ACPI_PCI_SLOT=y

CONFIG_ACPI_CONTAINER=y

CONFIG_ACPI_HOTPLUG_MEMORY=y
@@ -1161,6 +1165,7 @@ CONFIG_INET_ESP=m 
CONFIG_INET_ESP_OFFLOAD=m

# CONFIG_INET_ESPINTCP is not set

CONFIG_INET_IPCOMP=m

CONFIG_INET_TABLE_PERTURB_ORDER=16

CONFIG_INET_XFRM_TUNNEL=m

CONFIG_INET_TUNNEL=m

CONFIG_INET_DIAG=m
@@ -1610,7 +1615,6 @@ CONFIG_HAVE_NET_DSA=y 
CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_VLAN_8021Q_MVRP=y

# CONFIG_DECNET is not set

CONFIG_LLC=m

# CONFIG_LLC2 is not set

# CONFIG_ATALK is not set
@@ -1675,14 +1679,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" 
#

CONFIG_NET_CLS=y

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_CLS_U32_PERF=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m
@@ -1917,6 +1918,7 @@ CONFIG_SOCK_VALIDATE_XMIT=y 
CONFIG_NET_SOCK_MSG=y

CONFIG_NET_DEVLINK=y

CONFIG_PAGE_POOL=y

# CONFIG_PAGE_POOL_STATS is not set

CONFIG_FAILOVER=m

CONFIG_ETHTOOL_NETLINK=y

CONFIG_HAVE_EBPF_JIT=y
@@ -2186,6 +2188,7 @@ CONFIG_CDROM=m 
CONFIG_ZRAM=m

CONFIG_ZRAM_WRITEBACK=y

# CONFIG_ZRAM_MEMORY_TRACKING is not set

# CONFIG_ZRAM_MULTI_COMP is not set

# CONFIG_BLK_DEV_UMEM is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
@@ -2356,15 +2359,14 @@ CONFIG_SCSI_AACRAID=m 
# CONFIG_SCSI_AIC94XX is not set

# CONFIG_SCSI_MVSAS is not set

# CONFIG_SCSI_MVUMI is not set

# CONFIG_SCSI_DPT_I2O is not set

# CONFIG_SCSI_ADVANSYS is not set

# CONFIG_SCSI_ARCMSR is not set

# CONFIG_SCSI_ESAS2R is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

CONFIG_MEGARAID_SAS=m

CONFIG_SCSI_MPT3SAS=m

CONFIG_SCSI_3SNIC_SSSRAID=m

CONFIG_SCSI_MPT3SAS=m

CONFIG_SCSI_MPT2SAS_MAX_SGE=128

CONFIG_SCSI_MPT3SAS_MAX_SGE=128

CONFIG_SCSI_MPT2SAS=m
@@ -2880,6 +2882,7 @@ CONFIG_NET_VENDOR_NEBULA_MATRIX=y 
CONFIG_M1600=m

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

# CONFIG_UBL is not set

# CONFIG_NET_SB1000 is not set

CONFIG_PHYLIB=y

CONFIG_SWPHY=y
@@ -3778,6 +3781,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m 
# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set

# CONFIG_PTP_1588_CLOCK_IDTCM is not set

# CONFIG_PTP_1588_CLOCK_VMW is not set

# CONFIG_PTP_HISI is not set

# end of PTP clock support



CONFIG_PINCTRL=y
@@ -5127,6 +5131,7 @@ CONFIG_DRM_GMA600=y 
CONFIG_DRM_GMA3600=y

CONFIG_DRM_UDL=m

CONFIG_DRM_AST=m

# CONFIG_DRM_INSPUR is not set

CONFIG_DRM_MGAG200=m

CONFIG_DRM_QXL=m

CONFIG_DRM_BOCHS=m
@@ -5233,6 +5238,7 @@ CONFIG_FB_EFI=y 
CONFIG_FB_HYPERV=m

# CONFIG_FB_SIMPLE is not set

# CONFIG_FB_SM712 is not set

# CONFIG_FB_LS2K500 is not set

# end of Frame buffer Devices



#
@@ -6628,6 +6634,7 @@ CONFIG_PMC_ATOM=y 
CONFIG_MELLANOX_PLATFORM=y

CONFIG_MLXREG_HOTPLUG=m

# CONFIG_MLXREG_IO is not set

CONFIG_LOONGARCH_PLATFORM_DEVICES=y

CONFIG_HAVE_CLK=y

CONFIG_CLKDEV_LOOKUP=y

CONFIG_HAVE_CLK_PREPARE=y
@@ -6676,6 +6683,7 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y 
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set

CONFIG_IRQ_REMAP=y

CONFIG_HYPERV_IOMMU=y

CONFIG_IOVA_MAX_GLOBAL_MAGS=32



#

# Remoteproc drivers
@@ -7295,6 +7303,13 @@ CONFIG_INTEL_TH_PTI=m 
# CONFIG_COUNTER is not set

# CONFIG_MOST is not set

# CONFIG_ROH is not set

# CONFIG_UB is not set



#

# CPU Inspect

#

# CONFIG_CPU_INSPECT is not set

# end of CPU Inspect

# end of Device Drivers



#
@@ -7311,8 +7326,8 @@ CONFIG_EXT4_FS=m 
CONFIG_EXT4_USE_FOR_EXT2=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ERROR_REPORT=y

# CONFIG_EXT4_DEBUG is not set

CONFIG_EXT4_ERROR_REPORT=y

CONFIG_EXT4_MITIGATION_FALSE_SHARING=y

CONFIG_JBD2=m

# CONFIG_JBD2_DEBUG is not set
@@ -7669,6 +7684,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y 
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y

# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set

# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set

# CONFIG_SECURITY_LANDLOCK is not set

CONFIG_INTEGRITY=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -8174,7 +8190,6 @@ CONFIG_DEBUG_SECTION_MISMATCH=y 
CONFIG_SECTION_MISMATCH_WARN_ONLY=y

CONFIG_STACK_VALIDATION=y

# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set

# CONFIG_PGO_KERNEL is not set

# end of Compile-time checks and compiler options



#

scripts/kconfig/Makefile

+14 −0
Original line number Diff line number Diff line
@@ -82,6 +82,17 @@ update_oedefconfig: $(obj)/conf 
save_oedefconfig: $(obj)/conf

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/makeconfig.sh $(SRCARCH)



check_oedefconfig: $(obj)/conf

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m arch/$(SRCARCH)/configs/openeuler_defconfig > /dev/null

	@$(kecho) "#"

	@$(kecho) "# New options might needs to be updated to the default configuration file."

	@$(kecho) "# Use the following command:"

	@$(kecho) "# 'make openeuler_defconfig/menuconfig/update_oedefconfig/save_oedefconfig'"

	@$(kecho) "# !!! DO NOT EDIT !!!"

	@$(kecho) "#"

	@$(kecho) "# defconfig: arch/$(SRCARCH)/configs/openeuler_defconfig"

	@$(kecho) "#"

	$(Q)$(MAKE) -f $(srctree)/Makefile listnewconfig



defconfig: $(obj)/conf

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
@@ -151,6 +162,9 @@ help: 
	@echo  '                    default value without prompting'

	@echo  '  tinyconfig	  - Configure the tiniest possible kernel'

	@echo  '  testconfig	  - Run Kconfig unit tests (requires python3 and pytest)'

	@echo  '  update_oedefconfig  - Update arch/<ARCH>/configs/openeuler_defconfig base on current source code'

	@echo  '  save_oedefconfig    - Save current .config to arch/<ARCH>/configs/openeuler_defconfig'

	@echo  '  check_oedefconfig   - Check whether new options need to be added to the defdefault file'



# ===========================================================================

# object files used by all kconfig flavours

scripts/kconfig/makeconfig.sh

+5 −0
Original line number Diff line number Diff line
@@ -10,10 +10,15 @@ sed -e '/CONFIG_CC_VERSION_TEXT/d' \ 
    -e '/CONFIG_CC_IS_GCC/d' \

    -e '/CONFIG_GCC_VERSION/d' \

    -e '/CONFIG_LD_VERSION/d' \

    -e '/CONFIG_LD_IS/d' \

    -e '/CONFIG_CLANG_VERSION/d' \

    -e '/CONFIG_LLD_VERSION/d' \

    -e '/CONFIG_CC_CAN/d' \

    -e '/CONFIG_CC_HAS/d' \

    -e '/CONFIG_AS_VERSION/d' \

    -e '/CONFIG_AS_HAS/d' \

    -e '/CONFIG_AS_IS/d' \

    -e '/CONFIG_PAHOLE_VERSION/d' \

    -i .config



cp .config arch/$1/configs/openeuler_defconfig