From 3686c4a20a7e893868d265e4e536db8c72f619bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sun, 29 Mar 2026 14:12:45 +0200 Subject: [PATCH] kernel: Remove redundant CONFIG_MODULES from NVIDIA GPU fragments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove CONFIG_MODULES, CONFIG_MODULE_UNLOAD, and CONFIG_MODULE_SIG from the NVIDIA GPU config fragments (nvidia.x86_64.conf.in and nvidia.arm64.conf.in) since these are now provided by the shared common/modules/modules.conf and common/signing/module_signing.conf fragments, which are always included for confidential builds. NVIDIA GPU builds always use -x (confidential), so these options were redundant. CONFIG_FW_LOADER is kept as it is specific to GPU firmware loading needs. Signed-off-by: Fabiano Fidêncio --- .../kernel/configs/fragments/gpu/nvidia.arm64.conf.in | 10 ++++------ .../kernel/configs/fragments/gpu/nvidia.x86_64.conf.in | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/packaging/kernel/configs/fragments/gpu/nvidia.arm64.conf.in b/tools/packaging/kernel/configs/fragments/gpu/nvidia.arm64.conf.in index acf1768239..df825c3a5d 100644 --- a/tools/packaging/kernel/configs/fragments/gpu/nvidia.arm64.conf.in +++ b/tools/packaging/kernel/configs/fragments/gpu/nvidia.arm64.conf.in @@ -1,12 +1,10 @@ -# Support for loading modules and firmware. +# Support for loading firmware. # It is used to support loading GPU drivers. -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULES, CONFIG_MODULE_UNLOAD, and CONFIG_MODULE_SIG come from +# common/modules/modules.conf and common/signing/module_signing.conf +# (included for confidential builds). CONFIG_FW_LOADER=y -# CRYPTO_FIPS requires this config when loading modules is enabled. -CONFIG_MODULE_SIG=y - # Linux kernel version suffix CONFIG_LOCALVERSION="-nvidia-gpu${CONF_GUEST_SUFFIX}" diff --git a/tools/packaging/kernel/configs/fragments/gpu/nvidia.x86_64.conf.in b/tools/packaging/kernel/configs/fragments/gpu/nvidia.x86_64.conf.in index 3d92bf8796..34e6c25a86 100644 --- a/tools/packaging/kernel/configs/fragments/gpu/nvidia.x86_64.conf.in +++ b/tools/packaging/kernel/configs/fragments/gpu/nvidia.x86_64.conf.in @@ -2,10 +2,10 @@ # It's used to enable the MMIO access method for PCIe devices. CONFIG_PCI_MMCONFIG=y -# Support for loading modules and firmware +# Support for loading firmware. # It is used to support loading GPU drivers. -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULES and CONFIG_MODULE_UNLOAD come from +# common/modules/modules.conf (included for confidential builds). CONFIG_FW_LOADER=y # Linux kernel version suffix @@ -24,8 +24,8 @@ CONFIG_CRYPTO_ECC=y CONFIG_CRYPTO_ECDH=y CONFIG_CRYPTO_ECDSA=y -# Dependency of _CRYPTO_ -CONFIG_MODULE_SIG=y +# CONFIG_MODULE_SIG comes from common/signing/module_signing.conf +# (included for confidential builds). # HGX/DGX platform CONFIG_INFINIBAND=m