From 198be2178a27e3cba9152cc684d7716338d5f454 Mon Sep 17 00:00:00 2001
From: Vedashree Vidwans <vvidwans@nvidia.com>
Date: Thu, 30 Apr 2020 22:00:00 -0700
Subject: [PATCH] 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
---
 arch/nvgpu.yaml          | 17 ++++++-----------
 libs/Makefile.common.tmk |  6 ++++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/arch/nvgpu.yaml b/arch/nvgpu.yaml
index 79b095029..0a76b3460 100644
--- a/arch/nvgpu.yaml
+++ b/arch/nvgpu.yaml
@@ -12,14 +12,15 @@ nvgpu:
   children:
     # The common code element. This has gr, mm, etc.
     common:
-      safe: yes
+      safe: no
       children:
-        !include nvgpu-common.yaml
+        !include nvgpu-common.yaml nvgpu-next-common.yaml
 
     # HAL units - Hardware Abstraction Layer.
     hal:
+      safe: no
       children:
-        !include nvgpu-hal-new.yaml
+        !include nvgpu-hal-new.yaml nvgpu-next-hal.yaml
 
     # The QNX OS layer implementation units.
     qnx:
@@ -31,7 +32,7 @@ nvgpu:
     linux:
       safe: no
       children:
-        !include nvgpu-linux.yaml
+        !include nvgpu-linux.yaml nvgpu-next-linux.yaml
 
     # POSIX units for implementing the OS layer for unit testing.
     posix:
@@ -65,10 +66,4 @@ nvgpu:
     gpu_hw:
       safe: no
       children:
-        !include nvgpu-gpu_hw.yaml
-
-    # nvgpu-next code
-    nvgpu-next:
-      safe: no
-      children:
-        !include nvgpu-next.yaml
+        !include nvgpu-gpu_hw.yaml nvgpu-next-gpu_hw.yaml
diff --git a/libs/Makefile.common.tmk b/libs/Makefile.common.tmk
index 5adf957a6..f15d73baf 100644
--- a/libs/Makefile.common.tmk
+++ b/libs/Makefile.common.tmk
@@ -94,8 +94,10 @@ $(SRC_DEPS):        $(NVGPU_ARCH_YAML)
 $(NVGPU_ARCH_YAML): nvgpu-arch
 nvgpu-arch: $(ARCH_PY)
 	$(PYTHON2) $(ARCH_PY)				\
-		--arch-file $(NVGPU_ARCH)/nvgpu.yaml	\
-		--source    $(NVGPU_SOURCE)		\
+		--arch-file    $(NVGPU_ARCH)/nvgpu.yaml	\
+		--source       $(NVGPU_SOURCE)		\
+		--source       $(NVGPU_NEXT_SOURCE)	\
+		--include-path $(NVGPU_NEXT_ARCH)	\
 		sources --check
 
 .PHONY: nvgpu-arch