Commit 6e22c3b1 authored Mar 30, 2024 by Lin Yujun

configs: disable CONFIG_CMDLINE_FROM_BOOTLOADER CONFIG_INITRAMFS_PRESERVE_MTIME in 6.6

hulk inclusion
category: others
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CW2A



--------------------------------

CONFIG_INITRAMFS_PRESERVE_MTIME and CONFIG_CMDLINE_FROM_BOOTLOADER
is a new function in version 6.6, we do not use it, disable it
in openeuler_defconfig.

Signed-off-by: Lin Yujun <linyujun809@huawei.com>

parent 398d8373

arch/arm64/configs/openeuler_defconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ CONFIG_INITRAMFS_FILE_METADATA=""
		CONFIG_BOOT_CONFIG=y
		# CONFIG_BOOT_CONFIG_FORCE is not set
		# CONFIG_BOOT_CONFIG_EMBED is not set
		CONFIG_INITRAMFS_PRESERVE_MTIME=y
		# CONFIG_INITRAMFS_PRESERVE_MTIME is not set
		CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
		CONFIG_LD_ORPHAN_WARN=y
		@@ -577,7 +577,7 @@ CONFIG_CLEAR_USER_WORKAROUND=y
		#
		CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
		CONFIG_CMDLINE="console=ttyAMA0"
		CONFIG_CMDLINE_FROM_BOOTLOADER=y
		# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
		# CONFIG_CMDLINE_FORCE is not set
		CONFIG_EFI_STUB=y
		CONFIG_EFI=y

arch/x86/configs/openeuler_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ CONFIG_INITRAMFS_FILE_METADATA=""
		CONFIG_BOOT_CONFIG=y
		# CONFIG_BOOT_CONFIG_FORCE is not set
		# CONFIG_BOOT_CONFIG_EMBED is not set
		CONFIG_INITRAMFS_PRESERVE_MTIME=y
		# CONFIG_INITRAMFS_PRESERVE_MTIME is not set
		CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
		CONFIG_LD_ORPHAN_WARN=y