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

gpu: nvgpu: Remove dependency of gpu next

Browse Source 
Remove dependency of GPU next repo as this
is not used from release perspective of the
nvgpu.

Bug 4170369

Change-Id: I4959948e8f6e966eccc4bd369d5b7348bfb1b739
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2929688
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
This commit is contained in:
Laxman Dewangan
2023-07-02 14:28:40 +00:00
committed by mobile promotions
parent 321145b37e
commit 44827be1e4
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/nvgpu/Makefile.sources
View File

@@ -917,7 +917,3 @@ srcs += \
hal/grmgr/grmgr_ga100.c hal/grmgr/grmgr_ga100.c
endif endif
endif endif
srctree.nvgpu-next := $(NV_SOURCE)/kernel/nvgpu-next
include $(srctree.nvgpu-next)/drivers/gpu/nvgpu/Makefile.sources
srcs += $(addprefix ../../../../nvgpu-next/drivers/gpu/nvgpu/,$(srcs_next))

12
libs/Makefile.common.tmk
View File

@@ -44,12 +44,9 @@ ARCH_PY := $(NV_SOURCE)/core-private/tools/arch/arch.py
# #
# NVGPU_NEXT_SOURCE needs to be set for the Makefile.sources file to # NVGPU_NEXT_SOURCE needs to be set for the Makefile.sources file to
# properly handle include paths. # properly handle include paths.
NVGPU_NEXT_SOURCE := $(NV_SOURCE)/kernel/nvgpu-next/drivers/gpu/nvgpu
NVGPU_POSIX := 1 NVGPU_POSIX := 1
NVGPU_ARCH := $(NVGPU_SOURCE)/../../../arch NVGPU_ARCH := $(NVGPU_SOURCE)/../../../arch
NVGPU_NEXT_ARCH := $(NVGPU_NEXT_SOURCE)/../../../arch
NVGPU_ARCH_YAML := $(NVGPU_ARCH)/*.yaml $(NVGPU_NEXT_ARCH)/*.yaml
NV_COMPONENT_OWN_INTERFACE_DIR := . NV_COMPONENT_OWN_INTERFACE_DIR := .
NV_COMPONENT_INCLUDES := \ NV_COMPONENT_INCLUDES := \
@@ -59,10 +56,7 @@ NV_COMPONENT_INCLUDES := \
$(NV_SOURCE)/kernel/nvgpu/nvsched \ $(NV_SOURCE)/kernel/nvgpu/nvsched \
$(NV_SOURCE)/kernel/nvgpu/nvsched/include \ $(NV_SOURCE)/kernel/nvgpu/nvsched/include \
$(NV_SOURCE)/kernel/nvgpu/nvsched/include/nvs \ $(NV_SOURCE)/kernel/nvgpu/nvsched/include/nvs \
$(NVGPU_SOURCE)/../../../include \ $(NVGPU_SOURCE)/../../../include
$(NVGPU_NEXT_SOURCE) \
$(NVGPU_NEXT_SOURCE)/include \
$(NVGPU_NEXT_SOURCE)/../../../include
ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1) ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1)
NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += pthread rt NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += pthread rt
NVGPU_FORCE_SAFETY_PROFILE := 1 NVGPU_FORCE_SAFETY_PROFILE := 1
@@ -92,11 +86,9 @@ endif
-include $(NVGPU_SOURCE)/Makefile.sources -include $(NVGPU_SOURCE)/Makefile.sources
-include $(NV_SOURCE)/kernel/nvgpu/nvsched/Makefile.sources -include $(NV_SOURCE)/kernel/nvgpu/nvsched/Makefile.sources
-include $(NVGPU_NEXT_SOURCE)/Makefile.sources
NV_COMPONENT_SOURCES := \ NV_COMPONENT_SOURCES := \
$(addprefix $(NVGPU_SOURCE)/,$(srcs)) \ $(addprefix $(NVGPU_SOURCE)/,$(srcs)) \
$(addprefix $(NVGPU_NEXT_SOURCE)/,$(srcs_next)) \
$(addprefix $(NV_SOURCE)/kernel/nvgpu/nvsched/,$(NVS_SOURCES)) $(addprefix $(NV_SOURCE)/kernel/nvgpu/nvsched/,$(NVS_SOURCES))
# $(srcs_next) already has the NV_COMPONENT_DIR prefix so we already have the # $(srcs_next) already has the NV_COMPONENT_DIR prefix so we already have the
@@ -123,8 +115,6 @@ nvgpu-arch: $(ARCH_PY)
$(PYTHON2) $(ARCH_PY) \ $(PYTHON2) $(ARCH_PY) \
--arch-file $(NVGPU_ARCH)/nvgpu.yaml \ --arch-file $(NVGPU_ARCH)/nvgpu.yaml \
--source $(NVGPU_SOURCE) \ --source $(NVGPU_SOURCE) \
--source $(NVGPU_NEXT_SOURCE) \
--include-path $(NVGPU_NEXT_ARCH) \
sources --check sources --check
.PHONY: nvgpu-arch .PHONY: nvgpu-arch

4
userspace/units/Makefile.units.common.tmk
View File

@@ -52,9 +52,7 @@ NV_COMPONENT_INCLUDES += \
$(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/include \ $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/include \
$(NV_SOURCE)/kernel/nvgpu/nvsched/include \ $(NV_SOURCE)/kernel/nvgpu/nvsched/include \
$(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/include/external-nvs \ $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/include/external-nvs \
$(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu \ $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu
$(NV_SOURCE)/kernel/nvgpu-next/drivers/gpu/nvgpu/include \
$(NV_SOURCE)/kernel/nvgpu-next/drivers/gpu/nvgpu
ifdef NVGPU_CFLAGS ifdef NVGPU_CFLAGS
NV_COMPONENT_CFLAGS := \ NV_COMPONENT_CFLAGS := \