diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 37cc15a59..c4873257c 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -1,10 +1,27 @@
-GCOV_PROFILE := y
+nvgpu-t18x := ../../../../kernel-t18x/drivers/gpu/nvgpu
 
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/gpu/nvgpu
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/include/linux
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include
-ccflags-$(CONFIG_GK20A) += -Wno-multichar
-ccflags-$(CONFIG_GK20A) += -Werror
+nvgpu-y += \
+	$(nvgpu-t18x)/gp10b/gr_gp10b.o  \
+	$(nvgpu-t18x)/gp10b/gr_ctx_gp10b.o  \
+	$(nvgpu-t18x)/gp10b/ce2_gp10b.o \
+	$(nvgpu-t18x)/gp10b/mc_gp10b.o  \
+	$(nvgpu-t18x)/gp10b/fifo_gp10b.o  \
+	$(nvgpu-t18x)/gp10b/ltc_gp10b.o \
+	$(nvgpu-t18x)/gp10b/mm_gp10b.o \
+	$(nvgpu-t18x)/gp10b/fb_gp10b.o \
+	$(nvgpu-t18x)/gp10b/pmu_gp10b.o \
+	$(nvgpu-t18x)/gp10b/hal_gp10b.o \
+	$(nvgpu-t18x)/gp10b/rpfb_gp10b.o \
+	$(nvgpu-t18x)/gp10b/gp10b_gating_reglist.o \
+	$(nvgpu-t18x)/gp10b/regops_gp10b.o \
+	$(nvgpu-t18x)/gp10b/cde_gp10b.o \
+	$(nvgpu-t18x)/gp10b/therm_gp10b.o \
+	$(nvgpu-t18x)/gp10b/gp10b_sysfs.o
 
-obj-$(CONFIG_GK20A)	+= gp10b/
-obj-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += vgpu/gp10b/
+nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t18x)/gp10b/platform_gp10b_tegra.o
+
+nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
+	$(nvgpu-t18x)/vgpu/gp10b/vgpu_hal_gp10b.o  \
+	$(nvgpu-t18x)/vgpu/gp10b/vgpu_gr_gp10b.o  \
+	$(nvgpu-t18x)/vgpu/gp10b/vgpu_mm_gp10b.o \
+	$(nvgpu-t18x)/vgpu/gp10b/vgpu_fifo_gp10b.o
diff --git a/drivers/gpu/nvgpu/gp10b/Makefile b/drivers/gpu/nvgpu/gp10b/Makefile
deleted file mode 100644
index 8b930bca4..000000000
--- a/drivers/gpu/nvgpu/gp10b/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-GCOV_PROFILE := y
-
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/gpu/nvgpu
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/include
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/devfreq
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi
-
-ccflags-$(CONFIG_GK20A) += -Wno-multichar
-ccflags-y += -Werror
-
-obj-$(CONFIG_GK20A)  += \
-	gr_gp10b.o  \
-	gr_ctx_gp10b.o  \
-	ce2_gp10b.o \
-	mc_gp10b.o  \
-	fifo_gp10b.o  \
-	ltc_gp10b.o \
-	mm_gp10b.o \
-	fb_gp10b.o \
-	pmu_gp10b.o \
-	hal_gp10b.o \
-	rpfb_gp10b.o \
-	gp10b_gating_reglist.o \
-	regops_gp10b.o \
-	cde_gp10b.o \
-	therm_gp10b.o \
-	gp10b_sysfs.o
-
-obj-$(CONFIG_TEGRA_GK20A) += platform_gp10b_tegra.o
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/Makefile b/drivers/gpu/nvgpu/vgpu/gp10b/Makefile
deleted file mode 100644
index fed8a08e7..000000000
--- a/drivers/gpu/nvgpu/vgpu/gp10b/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-GCOV_PROFILE := y
-
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/gpu/nvgpu
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/include
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi
-
-ccflags-$(CONFIG_GK20A) += -Wno-multichar
-ccflags-y += -Werror
-
-obj-$(CONFIG_GK20A)  += \
-	vgpu_hal_gp10b.o  \
-	vgpu_gr_gp10b.o  \
-	vgpu_mm_gp10b.o \
-	vgpu_fifo_gp10b.o