diff --git a/arch/nvgpu.yaml b/arch/nvgpu.yaml
index 7897092fa..79b095029 100644
--- a/arch/nvgpu.yaml
+++ b/arch/nvgpu.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019, NVIDIA CORPORATION.  All Rights Reserved.
+# Copyright (c) 2019-2020, NVIDIA CORPORATION.  All Rights Reserved.
 #
 # Top level NVGPU architecure description in YAML.
 #
@@ -66,3 +66,9 @@ nvgpu:
       safe: no
       children:
         !include nvgpu-gpu_hw.yaml
+
+    # nvgpu-next code
+    nvgpu-next:
+      safe: no
+      children:
+        !include nvgpu-next.yaml
diff --git a/drivers/gpu/nvgpu/Makefile.tmk b/drivers/gpu/nvgpu/Makefile.tmk
index 853ba00b0..4ea5ea64b 100644
--- a/drivers/gpu/nvgpu/Makefile.tmk
+++ b/drivers/gpu/nvgpu/Makefile.tmk
@@ -1,6 +1,6 @@
 ################################### tell Emacs this is a -*- makefile-gmake -*-
 #
-# Copyright (c) 2018 NVIDIA CORPORATION.  All Rights Reserved.
+# Copyright (c) 2018-2020 NVIDIA CORPORATION.  All Rights Reserved.
 #
 # NVIDIA CORPORATION and its licensors retain all intellectual property
 # and proprietary rights in and to this software, related documentation
@@ -37,7 +37,8 @@ NVGPU_NEXT_SOURCE := \
 
 NVGPU_POSIX			:= 1
 NVGPU_ARCH			:= $(NV_COMPONENT_DIR)/../../../arch
-NVGPU_ARCH_YAML                 := $(NVGPU_ARCH)/*.yaml
+NVGPU_NEXT_ARCH			:= $(NVGPU_NEXT_SOUCRE)/../../../arch
+NVGPU_ARCH_YAML                 := $(NVGPU_ARCH)/*.yaml $(NVGPU_NEXT_ARCH)/*.yaml
 
 NV_COMPONENT_NAME		:= nvgpu-drv
 NV_COMPONENT_OWN_INTERFACE_DIR	:= .