diff options
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 33 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/Makefile | 31 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/Makefile | 16 |
3 files changed, 25 insertions, 55 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 37cc15a5..c4873257 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -1,10 +1,27 @@ | |||
1 | GCOV_PROFILE := y | 1 | nvgpu-t18x := ../../../../kernel-t18x/drivers/gpu/nvgpu |
2 | 2 | ||
3 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/gpu/nvgpu | 3 | nvgpu-y += \ |
4 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/include/linux | 4 | $(nvgpu-t18x)/gp10b/gr_gp10b.o \ |
5 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include | 5 | $(nvgpu-t18x)/gp10b/gr_ctx_gp10b.o \ |
6 | ccflags-$(CONFIG_GK20A) += -Wno-multichar | 6 | $(nvgpu-t18x)/gp10b/ce2_gp10b.o \ |
7 | ccflags-$(CONFIG_GK20A) += -Werror | 7 | $(nvgpu-t18x)/gp10b/mc_gp10b.o \ |
8 | $(nvgpu-t18x)/gp10b/fifo_gp10b.o \ | ||
9 | $(nvgpu-t18x)/gp10b/ltc_gp10b.o \ | ||
10 | $(nvgpu-t18x)/gp10b/mm_gp10b.o \ | ||
11 | $(nvgpu-t18x)/gp10b/fb_gp10b.o \ | ||
12 | $(nvgpu-t18x)/gp10b/pmu_gp10b.o \ | ||
13 | $(nvgpu-t18x)/gp10b/hal_gp10b.o \ | ||
14 | $(nvgpu-t18x)/gp10b/rpfb_gp10b.o \ | ||
15 | $(nvgpu-t18x)/gp10b/gp10b_gating_reglist.o \ | ||
16 | $(nvgpu-t18x)/gp10b/regops_gp10b.o \ | ||
17 | $(nvgpu-t18x)/gp10b/cde_gp10b.o \ | ||
18 | $(nvgpu-t18x)/gp10b/therm_gp10b.o \ | ||
19 | $(nvgpu-t18x)/gp10b/gp10b_sysfs.o | ||
8 | 20 | ||
9 | obj-$(CONFIG_GK20A) += gp10b/ | 21 | nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t18x)/gp10b/platform_gp10b_tegra.o |
10 | obj-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += vgpu/gp10b/ | 22 | |
23 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | ||
24 | $(nvgpu-t18x)/vgpu/gp10b/vgpu_hal_gp10b.o \ | ||
25 | $(nvgpu-t18x)/vgpu/gp10b/vgpu_gr_gp10b.o \ | ||
26 | $(nvgpu-t18x)/vgpu/gp10b/vgpu_mm_gp10b.o \ | ||
27 | $(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 8b930bca..00000000 --- a/drivers/gpu/nvgpu/gp10b/Makefile +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | GCOV_PROFILE := y | ||
2 | |||
3 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/gpu/nvgpu | ||
4 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/include | ||
5 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/devfreq | ||
6 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu | ||
7 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include | ||
8 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi | ||
9 | |||
10 | ccflags-$(CONFIG_GK20A) += -Wno-multichar | ||
11 | ccflags-y += -Werror | ||
12 | |||
13 | obj-$(CONFIG_GK20A) += \ | ||
14 | gr_gp10b.o \ | ||
15 | gr_ctx_gp10b.o \ | ||
16 | ce2_gp10b.o \ | ||
17 | mc_gp10b.o \ | ||
18 | fifo_gp10b.o \ | ||
19 | ltc_gp10b.o \ | ||
20 | mm_gp10b.o \ | ||
21 | fb_gp10b.o \ | ||
22 | pmu_gp10b.o \ | ||
23 | hal_gp10b.o \ | ||
24 | rpfb_gp10b.o \ | ||
25 | gp10b_gating_reglist.o \ | ||
26 | regops_gp10b.o \ | ||
27 | cde_gp10b.o \ | ||
28 | therm_gp10b.o \ | ||
29 | gp10b_sysfs.o | ||
30 | |||
31 | 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 fed8a08e..00000000 --- a/drivers/gpu/nvgpu/vgpu/gp10b/Makefile +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | GCOV_PROFILE := y | ||
2 | |||
3 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/drivers/gpu/nvgpu | ||
4 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/include | ||
5 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu | ||
6 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include | ||
7 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi | ||
8 | |||
9 | ccflags-$(CONFIG_GK20A) += -Wno-multichar | ||
10 | ccflags-y += -Werror | ||
11 | |||
12 | obj-$(CONFIG_GK20A) += \ | ||
13 | vgpu_hal_gp10b.o \ | ||
14 | vgpu_gr_gp10b.o \ | ||
15 | vgpu_mm_gp10b.o \ | ||
16 | vgpu_fifo_gp10b.o | ||