diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile
index 79db7dfa..c3db0105 100644
--- a/drivers/platform/tegra/Makefile
+++ b/drivers/platform/tegra/Makefile
@@ -15,3 +15,5 @@ tegra-cactmon-objs += actmon_common.o
 obj-m += tegra-cactmon.o
 obj-m += tegra-epl.o
 obj-m += tegra-fsicom.o
+
+obj-m += cvnas/
diff --git a/drivers/platform/tegra/cvnas/Makefile b/drivers/platform/tegra/cvnas/Makefile
new file mode 100644
index 00000000..37a9470b
--- /dev/null
+++ b/drivers/platform/tegra/cvnas/Makefile
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+
+# NOTE: Do not change or add anything in this makefile.
+# The source code and makefile rules are copied from the
+# kernel/nvidia/drivers/platform/tegra/cvnas. This file is
+# just place-holder for empty makefile to avoid any build
+# issue when copy is not done from command line and building
+# the tree independent of source copy.
+
diff --git a/kernel-src-files-copy-list.txt b/kernel-src-files-copy-list.txt
index 5c65da05..83ae7b3d 100644
--- a/kernel-src-files-copy-list.txt
+++ b/kernel-src-files-copy-list.txt
@@ -10,3 +10,8 @@ copy_file nvidia/include/linux/nvmap.h include/linux/nvmap.h
 copy_file nvidia/include/linux/nvmap_t19x.h include/linux/nvmap_t19x.h
 copy_file nvidia/include/trace/events/nvmap.h include/trace/events/nvmap.h
 copy_file nvidia/include/uapi/linux/nvmap.h include/uapi/linux/nvmap.h
+
+# Files/directories for cvnas module
+copy_dir nvidia/drivers/platform/tegra/cvnas drivers/platform/tegra/cvnas
+copy_file nvidia/include/linux/cvnas.h include/linux/cvnas.h
+copy_file nvidia/include/soc/tegra/fuse-helper.h include/soc/tegra/fuse-helper.h