diff options
author | Stephen Warren <swarren@nvidia.com> | 2017-09-14 12:51:18 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-29 14:00:42 -0400 |
commit | 20bb0324e532863cafc5dc41e8cd5a6ec28413d8 (patch) | |
tree | b1dffa63f11bb210bfc6b84ce0fc6f940428fa61 /drivers/net | |
parent | c04513ee6f787a70c9cc839117918e92e38ae9ff (diff) |
nvidia: 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: I425d37d55f8ea61fb3a082a1504f994ff30cec03
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1561187
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Makefile (renamed from drivers/net/Makefile.nvidia) | 0 | ||||
-rw-r--r-- | drivers/net/can/Kconfig | 5 | ||||
-rw-r--r-- | drivers/net/can/Kconfig.nvidia | 3 | ||||
-rw-r--r-- | drivers/net/can/Makefile (renamed from drivers/net/can/Makefile.nvidia) | 0 | ||||
-rw-r--r-- | drivers/net/can/mttcan/Makefile (renamed from drivers/net/can/mttcan/Makefile.nvidia) | 0 | ||||
-rw-r--r-- | drivers/net/can/mttcan/ivc/Kconfig (renamed from drivers/net/can/mttcan/ivc/Kconfig.nvidia) | 0 | ||||
-rw-r--r-- | drivers/net/can/mttcan/ivc/Makefile (renamed from drivers/net/can/mttcan/ivc/Makefile.nvidia) | 0 | ||||
-rw-r--r-- | drivers/net/can/mttcan/native/Kconfig (renamed from drivers/net/can/mttcan/native/Kconfig.nvidia) | 0 | ||||
-rw-r--r-- | drivers/net/can/mttcan/native/Makefile (renamed from drivers/net/can/mttcan/native/Makefile.nvidia) | 2 | ||||
-rw-r--r-- | drivers/net/can/nvsec/Kconfig (renamed from drivers/net/can/nvsec/Kconfig.nvidia) | 0 | ||||
-rw-r--r-- | drivers/net/can/nvsec/Makefile (renamed from drivers/net/can/nvsec/Makefile.nvidia) | 0 |
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 @@ | |||
1 | if CAN_DEV | ||
2 | source "drivers/net/can/mttcan/native/Kconfig" | ||
3 | source "drivers/net/can/mttcan/ivc/Kconfig" | ||
4 | source "drivers/net/can/nvsec/Kconfig" | ||
5 | 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 @@ | |||
1 | trysource "../nvidia/drivers/net/can/mttcan/native/Kconfig.nvidia" | ||
2 | trysource "../nvidia/drivers/net/can/mttcan/ivc/Kconfig.nvidia" | ||
3 | 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 | |||
21 | mttcan-y += ../hal/m_ttcan_intr.o ../hal/m_ttcan_list.o ../hal/m_ttcan_ram.o | 21 | mttcan-y += ../hal/m_ttcan_intr.o ../hal/m_ttcan_list.o ../hal/m_ttcan_ram.o |
22 | mttcan-y += ../hal/m_ttcan_tt.o | 22 | mttcan-y += ../hal/m_ttcan_tt.o |
23 | 23 | ||
24 | ccflags-y += -I$(src)/../include | 24 | 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 | |||