nvgpu: use kernel overlay features

Update all Kconfig files and Makefiles to rely on the kernel overlay
feature. In particular, don't include any Kconfig files or Makefiles
from other overlays. -I directives in CFLAGS are not yet cleaned up.

Bug 1978395

Change-Id: I449ed2f07949785f2dd90a6833f4d8cd1711519a
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1566641
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 6 insertions, 11 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
new file mode 100644
index 00000000..d9c76e76
--- /dev/null
+++ b/drivers/Kconfig
@@ -0,0 +1,5 @@
+append_menu "Device Drivers"
+
+source "drivers/gpu/nvgpu/Kconfig"
+
+endmenu
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
new file mode 100644
index 00000000..af71a62a
--- /dev/null
+++ b/drivers/gpu/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_GK20A) += nvgpu/
diff --git a/drivers/gpu/nvgpu/Kconfig.nvgpu b/drivers/gpu/nvgpu/Kconfig
index 2a922ba2..4f90a35c 100644
--- a/drivers/gpu/nvgpu/Kconfig.nvgpu
+++ b/drivers/gpu/nvgpu/Kconfig
@@ -136,5 +136,3 @@ config GK20A_VIDMEM
           Enable support for using and allocating buffers in a distinct video
           memory aperture (in contrast to general system memory), available on
           GPUs that have their own banks. PCIe GPUs have this, for example.
-
-trysource "../nvgpu-t19x/drivers/gpu/nvgpu/Kconfig"
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile
index 1217fead..af7a8af5 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu
+++ b/drivers/gpu/nvgpu/Makefile
@@ -256,12 +256,3 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
         vgpu/gp10b/vgpu_gr_gp10b.o  \
         vgpu/gp10b/vgpu_mm_gp10b.o
 endif
-
-ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
-ifneq ($(wildcard $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile),)
-include $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile
-endif
-ifneq ($(wildcard $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile.nvgpu-t19x),)
-include $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile.nvgpu-t19x
-endif
-endif