diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-03-08 13:19:22 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-03-14 16:17:45 -0400 |
commit | 439d5939d4633171223ee58263e9cca919d30f2a (patch) | |
tree | b160acb1d9f90b65f18f7fb0224b09046e3aae3b /drivers/gpu/nvgpu | |
parent | 876726b0b650c17f775922590d2a6463c8bd7d92 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1028349
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
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 | |||
8 | ccflags-y += -Wno-error=cpp | 8 | ccflags-y += -Wno-error=cpp |
9 | 9 | ||
10 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) | 10 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) |
11 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu | 11 | ccflags-y += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu |
12 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include | 12 | ccflags-y += -I$(srctree)/../kernel-t18x/include |
13 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi | 13 | ccflags-y += -I$(srctree)/../kernel-t18x/include/uapi |
14 | endif | 14 | endif |
15 | 15 | ||
16 | obj-$(CONFIG_GK20A) := nvgpu.o | 16 | obj-$(CONFIG_GK20A) := nvgpu.o |
@@ -94,7 +94,5 @@ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ | |||
94 | gk20a/css_gr_gk20a.o | 94 | gk20a/css_gr_gk20a.o |
95 | 95 | ||
96 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) | 96 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) |
97 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu | 97 | include ../kernel-t18x/drivers/gpu/nvgpu/Makefile |
98 | ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include | ||
99 | obj-$(CONFIG_GK20A) += ../../../../kernel-t18x/drivers/gpu/nvgpu/ | ||
100 | endif | 98 | endif |