From 23d15214ae7d1e98b33552cd4cd2346cfea5725f Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Wed, 15 Oct 2014 16:39:01 +0300 Subject: gpu: nvgpu: allow building as a separate module Include object files of gk20a, gm20b and vgpu in the same composite object nvgpu.o in the top-level makefile, and remove the old makefiles. This helps in building the driver as a separate module. Bug 1476801 Change-Id: I93531c0f1a20e46904a429e492f8ed32e4f0c4a1 Signed-off-by: Konsta Holtta Reviewed-on: http://git-master/r/557971 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/Makefile | 64 ++++++++++++++++++++++++++++++++++++++-- drivers/gpu/nvgpu/gk20a/Makefile | 44 --------------------------- drivers/gpu/nvgpu/gm20b/Makefile | 19 ------------ drivers/gpu/nvgpu/vgpu/Makefile | 10 ------- 4 files changed, 61 insertions(+), 76 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gk20a/Makefile delete mode 100644 drivers/gpu/nvgpu/gm20b/Makefile delete mode 100644 drivers/gpu/nvgpu/vgpu/Makefile (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 6544b315..5d98b98b 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -1,8 +1,66 @@ GCOV_PROFILE := y +ccflags-y += -Idrivers/gpu/nvgpu +ccflags-y += -Idrivers/video/tegra/host +ccflags-y += -Idrivers/devfreq ccflags-y += -Wno-multichar ccflags-y += -Werror -obj-$(CONFIG_GK20A) += gk20a/ -obj-$(CONFIG_GK20A) += gm20b/ -obj-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += vgpu/ +obj-$(CONFIG_GK20A) := nvgpu.o + +nvgpu-y := \ + gk20a/gk20a.o \ + gk20a/as_gk20a.o \ + gk20a/ctrl_gk20a.o \ + gk20a/fifo_gk20a.o \ + gk20a/channel_gk20a.o \ + gk20a/channel_sync_gk20a.o \ + gk20a/debug_gk20a.o \ + gk20a/dbg_gpu_gk20a.o \ + gk20a/regops_gk20a.o \ + gk20a/gr_gk20a.o \ + gk20a/kind_gk20a.o \ + gk20a/mm_gk20a.o \ + gk20a/pmu_gk20a.o \ + gk20a/priv_ring_gk20a.o \ + gk20a/semaphore_gk20a.o \ + gk20a/fence_gk20a.o \ + gk20a/clk_gk20a.o \ + gk20a/therm_gk20a.o \ + gk20a/gr_ctx_gk20a_sim.o \ + gk20a/gr_ctx_gk20a.o \ + gk20a/gk20a_gating_reglist.o \ + gk20a/gk20a_scale.o \ + gk20a/gk20a_sysfs.o \ + gk20a/ltc_gk20a.o \ + gk20a/fb_gk20a.o \ + gk20a/hal.o \ + gk20a/hal_gk20a.o \ + gk20a/gk20a_allocator.o \ + gk20a/cde_gk20a.o \ + gk20a/platform_gk20a_generic.o \ + gk20a/tsg_gk20a.o \ + gm20b/hal_gm20b.o \ + gm20b/ltc_gm20b.o \ + gm20b/gr_gm20b.o \ + gm20b/gr_gm20b.o \ + gm20b/fb_gm20b.o \ + gm20b/fifo_gm20b.o \ + gm20b/gr_ctx_gm20b.o \ + gm20b/gm20b_gating_reglist.o \ + gm20b/acr_gm20b.o \ + gm20b/pmu_gm20b.o \ + gm20b/clk_gm20b.o \ + gm20b/mm_gm20b.o \ + gm20b/regops_gm20b.o + +nvgpu-$(CONFIG_TEGRA_GK20A) += gk20a/platform_gk20a_tegra.o +nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o + +nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ + gk20a/platform_vgpu_tegra.o \ + vgpu/ltc_vgpu.o \ + vgpu/gr_vgpu.o \ + vgpu/fifo_vgpu.o \ + vgpu/mm_vgpu.o \ + vgpu/vgpu.o diff --git a/drivers/gpu/nvgpu/gk20a/Makefile b/drivers/gpu/nvgpu/gk20a/Makefile deleted file mode 100644 index fbc9cbec..00000000 --- a/drivers/gpu/nvgpu/gk20a/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -Idrivers/gpu/nvgpu -ccflags-y += -Idrivers/video/tegra/host -ccflags-y += -Idrivers/devfreq -ccflags-y += -Wno-multichar -ccflags-y += -Werror - -nvgpu-y := \ - gk20a.o \ - as_gk20a.o \ - ctrl_gk20a.o \ - fifo_gk20a.o \ - channel_gk20a.o \ - channel_sync_gk20a.o \ - debug_gk20a.o \ - dbg_gpu_gk20a.o \ - regops_gk20a.o \ - gr_gk20a.o \ - kind_gk20a.o \ - mm_gk20a.o \ - pmu_gk20a.o \ - priv_ring_gk20a.o \ - semaphore_gk20a.o \ - fence_gk20a.o \ - clk_gk20a.o \ - therm_gk20a.o \ - gr_ctx_gk20a_sim.o \ - gr_ctx_gk20a.o \ - gk20a_gating_reglist.o \ - gk20a_scale.o \ - gk20a_sysfs.o \ - ltc_gk20a.o \ - fb_gk20a.o \ - hal.o \ - hal_gk20a.o \ - gk20a_allocator.o \ - cde_gk20a.o \ - platform_gk20a_generic.o \ - tsg_gk20a.o -nvgpu-$(CONFIG_TEGRA_GK20A) += platform_gk20a_tegra.o -nvgpu-$(CONFIG_SYNC) += sync_gk20a.o -nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += platform_vgpu_tegra.o - -obj-$(CONFIG_GK20A) := nvgpu.o diff --git a/drivers/gpu/nvgpu/gm20b/Makefile b/drivers/gpu/nvgpu/gm20b/Makefile deleted file mode 100644 index 154fdcd5..00000000 --- a/drivers/gpu/nvgpu/gm20b/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -Idrivers/gpu/nvgpu -ccflags-y += -Wno-multichar -ccflags-y += -Werror - -obj-$(CONFIG_GK20A) = \ - hal_gm20b.o \ - ltc_gm20b.o \ - gr_gm20b.o \ - gr_gm20b.o \ - fb_gm20b.o \ - fifo_gm20b.o \ - gr_ctx_gm20b.o \ - gm20b_gating_reglist.o \ - acr_gm20b.o \ - pmu_gm20b.o \ - clk_gm20b.o \ - mm_gm20b.o \ - regops_gm20b.o diff --git a/drivers/gpu/nvgpu/vgpu/Makefile b/drivers/gpu/nvgpu/vgpu/Makefile deleted file mode 100644 index edad7171..00000000 --- a/drivers/gpu/nvgpu/vgpu/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -GCOV_PROFILE := y -ccflags-y += -Idrivers/gpu/nvgpu -ccflags-y += -Wno-multichar - -obj-$(CONFIG_TEGRA_GR_VIRTUALIZATION) = \ - ltc_vgpu.o \ - gr_vgpu.o \ - fifo_vgpu.o \ - mm_vgpu.o \ - vgpu.o -- cgit v1.2.2