From 4a54c2ae80e9c7c7ee53bc2bb39d2efb55d5a132 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Thu, 6 Sep 2018 15:44:25 -0700 Subject: gpu: nvgpu: Add sources for nvgpu-next in tmake Update the tmake build to build nvcgpu-next as well. See https://git-master.nvidia.com/r/1814622 For the necessary changes to make this compile. JIRA NVGPU-1104 Change-Id: Id44e20de78c1ebdb0247a1c3da79273380aba9fb Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1814623 Reviewed-by: Adeel Raza Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.tmk | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/Makefile.tmk') diff --git a/drivers/gpu/nvgpu/Makefile.tmk b/drivers/gpu/nvgpu/Makefile.tmk index db8a1d72..5a0d1126 100644 --- a/drivers/gpu/nvgpu/Makefile.tmk +++ b/drivers/gpu/nvgpu/Makefile.tmk @@ -17,10 +17,35 @@ include $(NV_BUILD_START_COMPONENT) include $(NV_COMPONENT_DIR)/Makefile.sources +# +# Include the nvgpu-next repo, if it's present. It's expected to be +# located in the same directory as nvgpu, like so: +# +# kernel/nvgpu +# kernel/nvgpu-next +# +# If it exists, this defines two variables: srcs_next which contains the +# necessary sources to build and HEADERS_NEXT which has any headers in +# nvgpu-next. +# +# NVGPU_NEXT_SOURCE needs to be set for the Makefile.sources file to +# properly handle include paths. +NVGPU_NEXT_SOURCE := \ + $(NV_COMPONENT_DIR)/../../../../nvgpu-next/drivers/gpu/nvgpu +-include $(NVGPU_NEXT_SOURCE)/Makefile.sources + NV_COMPONENT_NAME := nvgpu-drv NV_COMPONENT_OWN_INTERFACE_DIR := . -NV_COMPONENT_SOURCES := $(srcs) -NV_COMPONENT_INCLUDES := . include ../../../include +NV_COMPONENT_SOURCES := \ + $(srcs) \ + $(addprefix $(NVGPU_NEXT_SOURCE)/,$(srcs_next)) +NV_COMPONENT_INCLUDES := \ + . \ + include \ + ../../../include \ + $(NVGPU_NEXT_SOURCE) \ + $(NVGPU_NEXT_SOURCE)/include \ + $(NVGPU_NEXT_SOURCE)/../../../include ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1) NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += pthread endif -- cgit v1.2.2