nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

userspace: Enable nvgpu-next build

Browse Source 
Added targets in corresponding makefiles/sources to enable building
nvgpu-next from userspace.

JIRA NVGPU-1015

Change-Id: Ia358162e14205035e4552bfb7f32825c7de48fc2
Signed-off-by: Anup Mahindre <amahindre@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1792003
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Anup Mahindre
2018-08-03 16:20:04 +05:30
committed by mobile promotions
parent 7306f2b131
commit 02f9c99e4b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
userspace/Makefile
View File

@@ -39,14 +39,18 @@ CORE_OUT=$(OUT)/nvgpu_unit_core
# Nvgpu driver code. # Nvgpu driver code.
NVGPU_SRC=$(TWD)/../drivers/gpu/nvgpu NVGPU_SRC=$(TWD)/../drivers/gpu/nvgpu
NVGPU_OUT=$(OUT)/libnvgpu NVGPU_OUT=$(OUT)/libnvgpu
# Nvgpu_next driver code.
NVGPU_NEXT_SRC=$(TWD)/../../nvgpu-next/drivers/gpu/nvgpu
# Unit tests themselves. # Unit tests themselves.
UNIT_SRC=$(TWD)/units UNIT_SRC=$(TWD)/units
UNIT_OUT=$(OUT)/units UNIT_OUT=$(OUT)/units
INCLUDES= \ INCLUDES= \
-I$(NVGPU_SRC) \ -I$(NVGPU_SRC) \
-I$(NVGPU_SRC)/include \ -I$(NVGPU_SRC)/include \
-I$(NVGPU_NEXT_SRC) \
-I$(NVGPU_NEXT_SRC)/include \
-I$(TWD)/../include \ -I$(TWD)/../include \
-I$(TWD)/../include/uapi \ -I$(TWD)/../include/uapi \
-I$(TWD)/include -I$(TWD)/include
@@ -107,6 +111,14 @@ $(NVGPU_OUT)/%.o : $(NVGPU_SRC)/%.c $(HEADERS)
fi fi
$(CC) --coverage $(CFLAGS) $(configs) -c -o $@ $< $(CC) --coverage $(CFLAGS) $(configs) -c -o $@ $<
# Default build target for all the nvgpu-next driver object files we want to
# build in userspace. These too get bundled into libnvgpu-drv.so.
$(NVGPU_OUT)/%.o : $(NVGPU_NEXT_SRC)/%.c $(HEADERS) $(HEADERS_NEXT)
@if [ ! -d $(dir $@) ] ; then \
mkdir -p $(dir $@) ; \
fi
$(CC) --coverage $(CFLAGS) $(configs) -c -o $@ $<
# Build target for unit test files. These are not part of the libnvgpu-drv.so. # Build target for unit test files. These are not part of the libnvgpu-drv.so.
# These comprise the unit test framework. # These comprise the unit test framework.
$(CORE_OUT)/%.o : $(CORE_SRC)/%.c $(CORE_HEADERS) $(CORE_OUT)/%.o : $(CORE_SRC)/%.c $(CORE_HEADERS)

5
userspace/Makefile.sources
View File

@@ -20,9 +20,10 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
include ../drivers/gpu/nvgpu/Makefile.sources include $(NVGPU_SRC)/Makefile.sources
-include $(NVGPU_NEXT_SRC)/Makefile.sources
OBJS := $(srcs:%.c=$(NVGPU_OUT)/%.o) OBJS := $(srcs:%.c=$(NVGPU_OUT)/%.o) $(srcs_next:%.c=$(NVGPU_OUT)/%.o)
HEADERS := \ HEADERS := \
$(NVGPU_SRC)/include/nvgpu/*.h \ $(NVGPU_SRC)/include/nvgpu/*.h \