diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index 0ae6c3b6c..76937be8e 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -223,6 +223,10 @@ ifneq ($(CONFIG_NVGPU_DGPU),1)
 ifneq ($(NVGPU_HVRTOS),1)
 CONFIG_NVGPU_IGPU_VIRT          := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_IGPU_VIRT
+CONFIG_NVS_PRESENT		:= 1
+NVGPU_COMMON_CFLAGS		+= -DCONFIG_NVS_PRESENT
+NVS_USE_IMPL_TYPES		:= 1
+NVGPU_COMMON_CFLAGS		+= -DNVS_USE_IMPL_TYPES
 endif
 endif
 
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 9c8ee1515..eaf74ace9 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -188,6 +188,11 @@ srcs += common/cic/mon/mon_ce.c \
 	common/cic/mon/mon_mmu.c
 endif
 
+ifeq ($(CONFIG_NVS_PRESENT),1)
+srcs += common/nvs/nvs_sched_ctrl.c \
+	common/nvs/nvs_sched.c
+endif
+
 ifeq ($(CONFIG_NVGPU_GSP_SCHEDULER),1)
 srcs += common/gsp/gsp_init.c \
 	common/gsp/gsp_bootstrap.c \