diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index 3ba41c3c0..d528ec667 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -108,6 +108,15 @@ NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_FALCON_NON_FUSA
 # nvgpu_semaphore_get_value
 CONFIG_NVGPU_SW_SEMAPHORE :=1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_SW_SEMAPHORE
+
+CONFIG_NVGPU_GR_FALCON_NON_SECURE_BOOT := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_GR_FALCON_NON_SECURE_BOOT
+
+CONFIG_NVGPU_SM_DIVERSITY := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_SM_DIVERSITY
+
+CONFIG_NVGPU_USE_3LSS_ERR_INJECTION := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_USE_3LSS_ERR_INJECTION
 endif
 
 endif