gpu: nvgpu: YAML changes for nvgpu-next

Currently, nvgpu build is not syncing nvgpu-next arch and source files.
1. Add nvgpu-next yaml files to nvgpu.yaml.
2. Pass nvgpu-next source and include path to arch.py.

JIRA NVGPU-5007

Change-Id: I2ad04b0ef813912566a3b73dae39cf0373092913
Signed-off-by: Vedashree Vidwans <vvidwans@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2293860
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Vedashree Vidwans
2020-04-30 22:00:00 -07:00
committed by Alex Waterman
parent d03883d09d
commit 198be2178a
2 changed files with 10 additions and 13 deletions

View File

@@ -12,14 +12,15 @@ nvgpu:
children: children:
# The common code element. This has gr, mm, etc. # The common code element. This has gr, mm, etc.
common: common:
safe: yes safe: no
children: children:
!include nvgpu-common.yaml !include nvgpu-common.yaml nvgpu-next-common.yaml
# HAL units - Hardware Abstraction Layer. # HAL units - Hardware Abstraction Layer.
hal: hal:
safe: no
children: children:
!include nvgpu-hal-new.yaml !include nvgpu-hal-new.yaml nvgpu-next-hal.yaml
# The QNX OS layer implementation units. # The QNX OS layer implementation units.
qnx: qnx:
@@ -31,7 +32,7 @@ nvgpu:
linux: linux:
safe: no safe: no
children: children:
!include nvgpu-linux.yaml !include nvgpu-linux.yaml nvgpu-next-linux.yaml
# POSIX units for implementing the OS layer for unit testing. # POSIX units for implementing the OS layer for unit testing.
posix: posix:
@@ -65,10 +66,4 @@ nvgpu:
gpu_hw: gpu_hw:
safe: no safe: no
children: children:
!include nvgpu-gpu_hw.yaml !include nvgpu-gpu_hw.yaml nvgpu-next-gpu_hw.yaml
# nvgpu-next code
nvgpu-next:
safe: no
children:
!include nvgpu-next.yaml

View File

@@ -94,8 +94,10 @@ $(SRC_DEPS): $(NVGPU_ARCH_YAML)
$(NVGPU_ARCH_YAML): nvgpu-arch $(NVGPU_ARCH_YAML): nvgpu-arch
nvgpu-arch: $(ARCH_PY) 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