From 10e8592e50d353975857bbbe844daecfe12e0fa7 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Tue, 1 Nov 2022 20:18:42 +0000 Subject: [PATCH] ANDROID: GKI: Add CAN adapters as GKI modules Add CAN related non bus drivers as GKI modules. Bug: 229934827 Bug: 232431151 Test: TH Change-Id: I5d876363a0ea3007e5a83bbca53dcaae1e09e707 Signed-off-by: Ramji Jiyani (cherry picked from commit d166d423879bdec8b13903f1b5e0e568a657e856) --- BUILD.bazel | 6 ++++++ android/gki_system_dlkm_modules | 6 ++++++ arch/arm64/configs/gki_defconfig | 6 ++++++ arch/x86/configs/gki_defconfig | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/BUILD.bazel b/BUILD.bazel index 6af2195f5002..60b3cb7e6e42 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -22,7 +22,13 @@ load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define _common_gki_modules_list = [ # keep sorted "drivers/block/zram/zram.ko", + "drivers/net/can/dev/can-dev.ko", + "drivers/net/can/slcan/slcan.ko", + "drivers/net/can/vcan.ko", "mm/zsmalloc.ko", + "net/can/can-bcm.ko", + "net/can/can-gw.ko", + "net/can/can-raw.ko", "net/mac80211/mac80211.ko", "net/wireless/cfg80211.ko", ] diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index 45ada864ba6b..6979b422cce8 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -1,4 +1,10 @@ drivers/block/zram/zram.ko +drivers/net/can/dev/can-dev.ko +drivers/net/can/slcan/slcan.ko +drivers/net/can/vcan.ko mm/zsmalloc.ko +net/can/can-bcm.ko +net/can/can-gw.ko +net/can/can-raw.ko net/mac80211/mac80211.ko net/wireless/cfg80211.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 1e29aad5212f..40a9dce53c3d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -254,6 +254,9 @@ CONFIG_NET_ACT_BPF=y CONFIG_VSOCKETS=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CAN=y +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m CONFIG_BT=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y @@ -314,6 +317,9 @@ CONFIG_IFB=y CONFIG_MACSEC=y CONFIG_TUN=y CONFIG_VETH=y +CONFIG_CAN_DEV=m +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index afd17b1d8c9d..e4e201fc336a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -244,6 +244,9 @@ CONFIG_NET_ACT_BPF=y CONFIG_VSOCKETS=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CAN=y +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m CONFIG_BT=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y @@ -295,6 +298,9 @@ CONFIG_IFB=y CONFIG_MACSEC=y CONFIG_TUN=y CONFIG_VETH=y +CONFIG_CAN_DEV=m +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y