From 232bc192cdb7a7469d0811afc94d33904d7aebc4 Mon Sep 17 00:00:00 2001 From: Jonathan Maple Date: Thu, 3 Apr 2025 14:57:59 -0400 Subject: [PATCH] [CIQ] v6.12.17 config updates All configs dropped the follwoing since its dependent on ARCH_MVEBU which is not configured on so there is no reason to ask. # CONFIG_CZNIC_PLATFORMS is not set See upstream commit: dd0f05b98925111f4530d7dab774398cdb32e9e3 x86_64 configs also dropped a previously defined y config -CONFIG_IMX_SCMI_MISC_DRV=y This comes from firmware: imx: IMX_SCMI_MISC_DRV should depend on ARCH_MXC See Upstream Commit: be6686b823b30a69b1f71bde228ce042c78a1941 Whats a little confusing is that the fedora kernel-ark says that this is marked as a `y` $ cat redhat/configs/rhel/generic/CONFIG_IMX_SCMI_MISC_DRV CONFIG_IMX_SCMI_MISC_DRV=y [kernel-ark]$ ls redhat/configs/kernel-6.13.8-x86_64* redhat/configs/kernel-6.13.8-x86_64-automotive.config redhat/configs/kernel-6.13.8-x86_64.config redhat/configs/kernel-6.13.8-x86_64-rt.config redhat/configs/kernel-6.13.8-x86_64-automotive-debug.config redhat/configs/kernel-6.13.8-x86_64-debug.config redhat/configs/kernel-6.13.8-x86_64-rt-debug.config [kernel-ark]$ grep CONFIG_IMX_SCMI_MISC_DRV redhat/configs/kernel-6.13.8-x86_64* [kernel-ark]$ Do to this we're leaving this as the default Kconfig of off for x86_64 --- ciq/configs/kernel-aarch64-64k-debug.config | 3 +-- ciq/configs/kernel-aarch64-64k.config | 3 +-- ciq/configs/kernel-aarch64-debug.config | 6 ++---- ciq/configs/kernel-aarch64.config | 3 +-- ciq/configs/kernel-x86_64-debug.config | 4 +--- ciq/configs/kernel-x86_64.config | 4 +--- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ciq/configs/kernel-aarch64-64k-debug.config b/ciq/configs/kernel-aarch64-64k-debug.config index 0c76303decc33..d7e04d4d7a163 100644 --- a/ciq/configs/kernel-aarch64-64k-debug.config +++ b/ciq/configs/kernel-aarch64-64k-debug.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.15 Kernel Configuration +# Linux/arm64 6.12.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -6861,7 +6861,6 @@ CONFIG_CHROME_PLATFORMS=y # CONFIG_CROS_KBD_LED_BACKLIGHT is not set CONFIG_CROS_HPS_I2C=m # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set -# CONFIG_CZNIC_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m diff --git a/ciq/configs/kernel-aarch64-64k.config b/ciq/configs/kernel-aarch64-64k.config index c06e1f9cab7ad..d30d115055f20 100644 --- a/ciq/configs/kernel-aarch64-64k.config +++ b/ciq/configs/kernel-aarch64-64k.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.15 Kernel Configuration +# Linux/arm64 6.12.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -6840,7 +6840,6 @@ CONFIG_CHROME_PLATFORMS=y # CONFIG_CROS_KBD_LED_BACKLIGHT is not set CONFIG_CROS_HPS_I2C=m # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set -# CONFIG_CZNIC_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m diff --git a/ciq/configs/kernel-aarch64-debug.config b/ciq/configs/kernel-aarch64-debug.config index ce889082816c6..6880ba6e18a58 100644 --- a/ciq/configs/kernel-aarch64-debug.config +++ b/ciq/configs/kernel-aarch64-debug.config @@ -1,7 +1,6 @@ -# arm64 # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.15 Kernel Configuration +# Linux/arm64 6.12.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -6867,7 +6866,6 @@ CONFIG_CHROME_PLATFORMS=y # CONFIG_CROS_KBD_LED_BACKLIGHT is not set CONFIG_CROS_HPS_I2C=m # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set -# CONFIG_CZNIC_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m @@ -7836,10 +7834,10 @@ CONFIG_SECURITY_YAMA=y # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_LOCKDOWN_LSM=y CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y -CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=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_LOCK_DOWN_IN_EFI_SECURE_BOOT=y CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_IPE is not set CONFIG_INTEGRITY=y diff --git a/ciq/configs/kernel-aarch64.config b/ciq/configs/kernel-aarch64.config index 276a8cad32bde..187a31e375c0d 100644 --- a/ciq/configs/kernel-aarch64.config +++ b/ciq/configs/kernel-aarch64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.15 Kernel Configuration +# Linux/arm64 6.12.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -6845,7 +6845,6 @@ CONFIG_CHROME_PLATFORMS=y # CONFIG_CROS_KBD_LED_BACKLIGHT is not set CONFIG_CROS_HPS_I2C=m # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set -# CONFIG_CZNIC_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m diff --git a/ciq/configs/kernel-x86_64-debug.config b/ciq/configs/kernel-x86_64-debug.config index aba02a18b341a..f155dbc6d5aaf 100644 --- a/ciq/configs/kernel-x86_64-debug.config +++ b/ciq/configs/kernel-x86_64-debug.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.12.15 Kernel Configuration +# Linux/x86_64 6.12.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -2274,7 +2274,6 @@ CONFIG_UNACCEPTED_MEMORY=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y -CONFIG_IMX_SCMI_MISC_DRV=y # # Qualcomm firmware drivers @@ -7186,7 +7185,6 @@ CONFIG_XEN_FRONT_PGDIR_SHBUF=m # CONFIG_STAGING is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set -# CONFIG_CZNIC_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m diff --git a/ciq/configs/kernel-x86_64.config b/ciq/configs/kernel-x86_64.config index 1c8d168be14ae..86044bc1093cc 100644 --- a/ciq/configs/kernel-x86_64.config +++ b/ciq/configs/kernel-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.12.15 Kernel Configuration +# Linux/x86_64 6.12.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -2270,7 +2270,6 @@ CONFIG_UNACCEPTED_MEMORY=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y -CONFIG_IMX_SCMI_MISC_DRV=y # # Qualcomm firmware drivers @@ -7164,7 +7163,6 @@ CONFIG_XEN_FRONT_PGDIR_SHBUF=m # CONFIG_STAGING is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set -# CONFIG_CZNIC_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m