nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: compile local t18x code

Browse Source 
Compile local t18x code from nvgpu repo (in case
CONFIG_ARCH_TEGRA_18x_SOC config is set)
instead of compiling from $(srctree)/../nvgpu-t18x

Remove Makefile.nvgpu-t18x since this Makefile is
not needed now

Bug 200266498

Change-Id: Ib8ef39be7e948debe0ff895c904a6c370a5711a6
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1277119
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Deepak Nibade
2016-12-27 15:51:20 +05:30
committed by mobile promotions
parent 7a81883a0d
commit afe77b3445
2 changed files with 73 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
drivers/gpu/nvgpu/Makefile.nvgpu
View File

@@ -13,12 +13,6 @@ ifeq ($(VERSION),4)
ccflags-y += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
endif
ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
ccflags-y += -I$(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu
ccflags-y += -I$(srctree)/../nvgpu-t18x/include
ccflags-y += -I$(srctree)/../nvgpu-t18x/include/uapi
endif
ifeq ($(CONFIG_TEGRA_19x_GPU),y)
ccflags-y += -I$(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu
ccflags-y += -I$(srctree)/../nvgpu-t19x/include
@@ -135,12 +129,79 @@ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \
gk20a/css_gr_gk20a.o
ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
ifneq ($(wildcard $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile),)
include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile
endif
ifneq ($(wildcard $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile.nvgpu-t18x),)
include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile.nvgpu-t18x
endif
nvgpu-y += \
gp10b/gr_gp10b.o \
gp10b/gr_ctx_gp10b.o \
gp10b/ce_gp10b.o \
gp10b/mc_gp10b.o \
gp10b/fifo_gp10b.o \
gp10b/ltc_gp10b.o \
gp10b/mm_gp10b.o \
gp10b/fb_gp10b.o \
gp10b/pmu_gp10b.o \
gp10b/hal_gp10b.o \
gp10b/rpfb_gp10b.o \
gp10b/gp10b_gating_reglist.o \
gp10b/regops_gp10b.o \
gp10b/cde_gp10b.o \
gp10b/therm_gp10b.o \
gp10b/fecs_trace_gp10b.o \
gp10b/gp10b_sysfs.o \
gp10b/gp10b.o \
gp106/hal_gp106.o \
gp106/mm_gp106.o \
gp106/pmu_gp106.o \
gp106/gr_gp106.o \
gp106/gr_ctx_gp106.o \
gp106/acr_gp106.o \
gp106/sec2_gp106.o \
gp106/fifo_gp106.o \
gp106/ltc_gp106.o \
gp106/fb_gp106.o \
gp106/bios_gp106.o \
gp106/regops_gp106.o \
clk/clk_mclk.o \
pstate/pstate.o \
clk/clk_vin.o \
clk/clk_fll.o \
clk/clk_domain.o \
clk/clk_prog.o \
clk/clk_vf_point.o \
clk/clk_arb.o \
clk/clk_freq_controller.o \
perf/vfe_var.o \
perf/vfe_equ.o \
perf/perf.o \
clk/clk.o \
gp106/clk_gp106.o \
gp106/clk_arb_gp106.o \
gp106/gp106_gating_reglist.o \
gp106/xve_gp106.o \
gp106/therm_gp106.o \
gp106/xve_gp106.o \
pmgr/pwrdev.o \
pmgr/pmgr.o \
pmgr/pmgrpmu.o \
pmgr/pwrmonitor.o \
pmgr/pwrpolicy.o \
volt/volt_rail.o \
volt/volt_dev.o \
volt/volt_policy.o \
volt/volt_pmu.o \
therm/thrm.o \
therm/thrmdev.o \
therm/thrmchannel.o \
therm/thrmpmu.o \
lpwr/rppg.o \
lpwr/lpwr.o
nvgpu-$(CONFIG_TEGRA_GK20A) += gp10b/platform_gp10b_tegra.o
nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
vgpu/gp10b/vgpu_hal_gp10b.o \
vgpu/gp10b/vgpu_gr_gp10b.o \
vgpu/gp10b/vgpu_mm_gp10b.o \
vgpu/gp10b/vgpu_fifo_gp10b.o
endif
ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)

75
drivers/gpu/nvgpu/Makefile.nvgpu-t18x
View File

@@ -1,75 +0,0 @@
nvgpu-t18x := $(call tegra-path,nvgpu-t18x,drivers/gpu/nvgpu)
nvgpu-y += \
$(nvgpu-t18x)/gp10b/gr_gp10b.o \
$(nvgpu-t18x)/gp10b/gr_ctx_gp10b.o \
$(nvgpu-t18x)/gp10b/ce_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/fecs_trace_gp10b.o \
$(nvgpu-t18x)/gp10b/gp10b_sysfs.o \
$(nvgpu-t18x)/gp10b/gp10b.o \
$(nvgpu-t18x)/gp106/hal_gp106.o \
$(nvgpu-t18x)/gp106/mm_gp106.o \
$(nvgpu-t18x)/gp106/pmu_gp106.o \
$(nvgpu-t18x)/gp106/gr_gp106.o \
$(nvgpu-t18x)/gp106/gr_ctx_gp106.o \
$(nvgpu-t18x)/gp106/acr_gp106.o \
$(nvgpu-t18x)/gp106/sec2_gp106.o \
$(nvgpu-t18x)/gp106/fifo_gp106.o \
$(nvgpu-t18x)/gp106/ltc_gp106.o \
$(nvgpu-t18x)/gp106/fb_gp106.o \
$(nvgpu-t18x)/gp106/bios_gp106.o \
$(nvgpu-t18x)/gp106/regops_gp106.o \
$(nvgpu-t18x)/clk/clk_mclk.o \
$(nvgpu-t18x)/pstate/pstate.o \
$(nvgpu-t18x)/clk/clk_vin.o \
$(nvgpu-t18x)/clk/clk_fll.o \
$(nvgpu-t18x)/clk/clk_domain.o \
$(nvgpu-t18x)/clk/clk_prog.o \
$(nvgpu-t18x)/clk/clk_vf_point.o \
$(nvgpu-t18x)/clk/clk_arb.o \
$(nvgpu-t18x)/clk/clk_freq_controller.o \
$(nvgpu-t18x)/perf/vfe_var.o \
$(nvgpu-t18x)/perf/vfe_equ.o \
$(nvgpu-t18x)/perf/perf.o \
$(nvgpu-t18x)/clk/clk.o \
$(nvgpu-t18x)/gp106/clk_gp106.o \
$(nvgpu-t18x)/gp106/clk_arb_gp106.o \
$(nvgpu-t18x)/gp106/gp106_gating_reglist.o \
$(nvgpu-t18x)/gp106/xve_gp106.o \
$(nvgpu-t18x)/gp106/therm_gp106.o \
$(nvgpu-t18x)/gp106/xve_gp106.o \
$(nvgpu-t18x)/pmgr/pwrdev.o \
$(nvgpu-t18x)/pmgr/pmgr.o \
$(nvgpu-t18x)/pmgr/pmgrpmu.o \
$(nvgpu-t18x)/pmgr/pwrmonitor.o \
$(nvgpu-t18x)/pmgr/pwrpolicy.o \
$(nvgpu-t18x)/volt/volt_rail.o \
$(nvgpu-t18x)/volt/volt_dev.o \
$(nvgpu-t18x)/volt/volt_policy.o \
$(nvgpu-t18x)/volt/volt_pmu.o \
$(nvgpu-t18x)/therm/thrm.o \
$(nvgpu-t18x)/therm/thrmdev.o \
$(nvgpu-t18x)/therm/thrmchannel.o \
$(nvgpu-t18x)/therm/thrmpmu.o \
$(nvgpu-t18x)/lpwr/rppg.o \
$(nvgpu-t18x)/lpwr/lpwr.o
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