From 439d5939d4633171223ee58263e9cca919d30f2a Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 8 Mar 2016 10:19:22 -0800 Subject: gpu: nvgpu: Use include for importing T18x Makefile Refactor Makefile so that there is only one target. Bug 1476801 Change-Id: If0fe5f787214c9addd51295355e3ae5606e5e8fc Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1028349 --- drivers/gpu/nvgpu/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index f6b3a673..932dde1a 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -8,9 +8,9 @@ ccflags-y += -Werror ccflags-y += -Wno-error=cpp ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) -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-y += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu +ccflags-y += -I$(srctree)/../kernel-t18x/include +ccflags-y += -I$(srctree)/../kernel-t18x/include/uapi endif obj-$(CONFIG_GK20A) := nvgpu.o @@ -94,7 +94,5 @@ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ gk20a/css_gr_gk20a.o ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) -ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu -ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include -obj-$(CONFIG_GK20A) += ../../../../kernel-t18x/drivers/gpu/nvgpu/ +include ../kernel-t18x/drivers/gpu/nvgpu/Makefile endif -- cgit v1.2.2