From 17609ab57ffca27efde17733505c1adaf57168b9 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 29 Sep 2017 14:07:22 -0600 Subject: nvgpu-t19x: use kernel overlay features Update all Kconfig files and Makefiles to rely on the kernel overlay feature. In particular, don't include any Kconfig files or Makefiles from other overlays. -I directives in CFLAGS are not yet cleaned up. Bug 1978395 Change-Id: I16386f7f1e76bd68b55f3128b25eada029ae82c1 Signed-off-by: Stephen Warren Reviewed-on: https://git-master.nvidia.com/r/1571165 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 82 +++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'drivers/gpu/nvgpu/Makefile') diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 2edfa1bb..6344f7a9 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -1,45 +1,45 @@ -nvgpu-t19x := ../../../../nvgpu-t19x/drivers/gpu/nvgpu - +ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) nvgpu-y += \ - $(nvgpu-t19x)/common/mm/gmmu_t19x.o \ - $(nvgpu-t19x)/common/linux/ioctl_tsg_t19x.o \ - $(nvgpu-t19x)/common/linux/ioctl_ctrl_t19x.o \ - $(nvgpu-t19x)/common/linux/io_t19x.o \ - $(nvgpu-t19x)/common/linux/module_t19x.o \ - $(nvgpu-t19x)/common/linux/pci_t19x.o \ - $(nvgpu-t19x)/gv11b/gv11b.o \ - $(nvgpu-t19x)/gv11b/css_gr_gv11b.o \ - $(nvgpu-t19x)/gv11b/dbg_gpu_gv11b.o \ - $(nvgpu-t19x)/gv11b/mc_gv11b.o \ - $(nvgpu-t19x)/gv11b/ltc_gv11b.o \ - $(nvgpu-t19x)/gv11b/hal_gv11b.o \ - $(nvgpu-t19x)/gv11b/gv11b_gating_reglist.o \ - $(nvgpu-t19x)/gv11b/gr_gv11b.o \ - $(nvgpu-t19x)/gv11b/fb_gv11b.o \ - $(nvgpu-t19x)/gv11b/fifo_gv11b.o \ - $(nvgpu-t19x)/gv11b/mm_gv11b.o \ - $(nvgpu-t19x)/gv11b/ce_gv11b.o \ - $(nvgpu-t19x)/gv11b/gr_ctx_gv11b.o \ - $(nvgpu-t19x)/gv11b/pmu_gv11b.o \ - $(nvgpu-t19x)/gv11b/acr_gv11b.o \ - $(nvgpu-t19x)/gv11b/subctx_gv11b.o \ - $(nvgpu-t19x)/gv11b/regops_gv11b.o \ - $(nvgpu-t19x)/gv11b/therm_gv11b.o \ - $(nvgpu-t19x)/gv100/mm_gv100.o \ - $(nvgpu-t19x)/gv100/gr_ctx_gv100.o \ - $(nvgpu-t19x)/gv100/fb_gv100.o \ - $(nvgpu-t19x)/gv100/bios_gv100.o \ - $(nvgpu-t19x)/gv100/fifo_gv100.o \ - $(nvgpu-t19x)/gv100/gr_gv100.o \ - $(nvgpu-t19x)/gv100/regops_gv100.o \ - $(nvgpu-t19x)/gv100/hal_gv100.o + common/mm/gmmu_t19x.o \ + common/linux/ioctl_tsg_t19x.o \ + common/linux/ioctl_ctrl_t19x.o \ + common/linux/io_t19x.o \ + common/linux/module_t19x.o \ + common/linux/pci_t19x.o \ + gv11b/gv11b.o \ + gv11b/css_gr_gv11b.o \ + gv11b/dbg_gpu_gv11b.o \ + gv11b/mc_gv11b.o \ + gv11b/ltc_gv11b.o \ + gv11b/hal_gv11b.o \ + gv11b/gv11b_gating_reglist.o \ + gv11b/gr_gv11b.o \ + gv11b/fb_gv11b.o \ + gv11b/fifo_gv11b.o \ + gv11b/mm_gv11b.o \ + gv11b/ce_gv11b.o \ + gv11b/gr_ctx_gv11b.o \ + gv11b/pmu_gv11b.o \ + gv11b/acr_gv11b.o \ + gv11b/subctx_gv11b.o \ + gv11b/regops_gv11b.o \ + gv11b/therm_gv11b.o \ + gv100/mm_gv100.o \ + gv100/gr_ctx_gv100.o \ + gv100/fb_gv100.o \ + gv100/bios_gv100.o \ + gv100/fifo_gv100.o \ + gv100/gr_gv100.o \ + gv100/regops_gv100.o \ + gv100/hal_gv100.o -nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t19x)/gv11b/platform_gv11b_tegra.o -nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += $(nvgpu-t19x)/common/linux/nvhost_t19x.o +nvgpu-$(CONFIG_TEGRA_GK20A) += gv11b/platform_gv11b_tegra.o +nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost_t19x.o nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ - $(nvgpu-t19x)/vgpu/gv11b/platform_gv11b_vgpu_tegra.o \ - $(nvgpu-t19x)/vgpu/gv11b/vgpu_hal_gv11b.o \ - $(nvgpu-t19x)/vgpu/gv11b/vgpu_gr_gv11b.o \ - $(nvgpu-t19x)/vgpu/gv11b/vgpu_fifo_gv11b.o \ - $(nvgpu-t19x)/vgpu/gv11b/vgpu_subctx_gv11b.o + vgpu/gv11b/platform_gv11b_vgpu_tegra.o \ + vgpu/gv11b/vgpu_hal_gv11b.o \ + vgpu/gv11b/vgpu_gr_gv11b.o \ + vgpu/gv11b/vgpu_fifo_gv11b.o \ + vgpu/gv11b/vgpu_subctx_gv11b.o +endif -- cgit v1.2.2