11 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/Makefile.nvidia b/drivers/net/Makefile
index fdedda760..fdedda760 100644
--- a/drivers/net/Makefile.nvidia
+++ b/drivers/net/Makefile
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
new file mode 100644
index 000000000..71ebba10b
--- /dev/null
+++ b/drivers/net/can/Kconfig
@@ -0,0 +1,5 @@
+if CAN_DEV
+source "drivers/net/can/mttcan/native/Kconfig"
+source "drivers/net/can/mttcan/ivc/Kconfig"
+source "drivers/net/can/nvsec/Kconfig"
+endif
diff --git a/drivers/net/can/Kconfig.nvidia b/drivers/net/can/Kconfig.nvidia
deleted file mode 100644
index 2dfd58d9e..000000000
--- a/drivers/net/can/Kconfig.nvidia
+++ /dev/null
@@ -1,3 +0,0 @@
-trysource "../nvidia/drivers/net/can/mttcan/native/Kconfig.nvidia"
-trysource "../nvidia/drivers/net/can/mttcan/ivc/Kconfig.nvidia"
-trysource "../nvidia/drivers/net/can/nvsec/Kconfig.nvidia"
diff --git a/drivers/net/can/Makefile.nvidia b/drivers/net/can/Makefile
index ba6577458..ba6577458 100644
--- a/drivers/net/can/Makefile.nvidia
+++ b/drivers/net/can/Makefile
diff --git a/drivers/net/can/mttcan/Makefile.nvidia b/drivers/net/can/mttcan/Makefile
index 8459c62cc..8459c62cc 100644
--- a/drivers/net/can/mttcan/Makefile.nvidia
+++ b/drivers/net/can/mttcan/Makefile
diff --git a/drivers/net/can/mttcan/ivc/Kconfig.nvidia b/drivers/net/can/mttcan/ivc/Kconfig
index a73619fd7..a73619fd7 100644
--- a/drivers/net/can/mttcan/ivc/Kconfig.nvidia
+++ b/drivers/net/can/mttcan/ivc/Kconfig
diff --git a/drivers/net/can/mttcan/ivc/Makefile.nvidia b/drivers/net/can/mttcan/ivc/Makefile
index 4ce03181d..4ce03181d 100644
--- a/drivers/net/can/mttcan/ivc/Makefile.nvidia
+++ b/drivers/net/can/mttcan/ivc/Makefile
diff --git a/drivers/net/can/mttcan/native/Kconfig.nvidia b/drivers/net/can/mttcan/native/Kconfig
index 28e8730ab..28e8730ab 100644
--- a/drivers/net/can/mttcan/native/Kconfig.nvidia
+++ b/drivers/net/can/mttcan/native/Kconfig
diff --git a/drivers/net/can/mttcan/native/Makefile.nvidia b/drivers/net/can/mttcan/native/Makefile
index 502d57b2c..b642dce42 100644
--- a/drivers/net/can/mttcan/native/Makefile.nvidia
+++ b/drivers/net/can/mttcan/native/Makefile
@@ -21,4 +21,4 @@ mttcan-y = m_ttcan_linux.o m_ttcan_sys.o ../hal/m_ttcan.o
 mttcan-y += ../hal/m_ttcan_intr.o ../hal/m_ttcan_list.o  ../hal/m_ttcan_ram.o
 mttcan-y += ../hal/m_ttcan_tt.o
 
-ccflags-y += -I$(src)/../include
+ccflags-y += -I$(overlay)/drivers/net/can/mttcan/include
diff --git a/drivers/net/can/nvsec/Kconfig.nvidia b/drivers/net/can/nvsec/Kconfig
index a0a50568b..a0a50568b 100644
--- a/drivers/net/can/nvsec/Kconfig.nvidia
+++ b/drivers/net/can/nvsec/Kconfig
diff --git a/drivers/net/can/nvsec/Makefile.nvidia b/drivers/net/can/nvsec/Makefile
index 9d6ab7a6b..9d6ab7a6b 100644
--- a/drivers/net/can/nvsec/Makefile.nvidia
+++ b/drivers/net/can/nvsec/Makefile