diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs
index ceb66227e..ee6078b35 100644
--- a/drivers/gpu/nvgpu/Makefile.linux.configs
+++ b/drivers/gpu/nvgpu/Makefile.linux.configs
@@ -59,7 +59,7 @@ endif
 # Support for remap
 CONFIG_NVGPU_REMAP := y
 
-ifeq ($(NV_BUILD_CONFIGURATION_VARIANT_IS_EMBEDDED),1)
+ifeq ($(NV_BUILD_SYSTEM_TYPE),embedded-linux))
 # Enable gsp scheduler support
 CONFIG_NVGPU_GSP_SCHEDULER := y
 endif
diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c
index 10fb98006..de0cfc18f 100644
--- a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c
+++ b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2023, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -221,6 +221,7 @@ int nvgpu_gsp_sched_bootstrap_hs(struct gk20a *g)
 		goto de_init;
 	}
 
+	nvgpu_info(g, "gsp scheduler bootstrapped.\n");
 	return status;
 de_init:
 	nvgpu_gsp_sched_sw_deinit(g);