projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5a76363)
ANDROID: cuttlefish_defconfig: Enable vsock options
authorCody Schuffelen <schuffelen@google.com>
Tue, 15 Jan 2019 02:37:28 +0000 (18:37 -0800)
committerAlistair Strachan <astrachan@google.com>
Tue, 22 Jan 2019 17:22:17 +0000 (17:22 +0000)
Bug: 121166534
Test: Ran cuttlefish with common kernel + vsock adb tunnel
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Change-Id: I8168a710052c7daada306a915c56230c961accd4

arch/arm64/configs/cuttlefish_defconfig patch | blob | blame | history
arch/x86/configs/x86_64_cuttlefish_defconfig patch | blob | blame | history

diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig
index 40332ac3f09468e298b98a68686eef8baaa3ac78..3d055ddb71da4c9908a4e2ec5957fee747aa8cfa 100644 (file)
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -183,6 +183,8 @@ CONFIG_NET_CLS_BPF=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_CLS_ACT=y
+CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=y
 CONFIG_CFG80211=y
 # CONFIG_CFG80211_DEFAULT_PS is not set
 CONFIG_MAC80211=y
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig
index c2a172bb8fec81530f1263a25fded483c7e07fd1..ca03b94c97720e977db755b54f3962198b63be24 100644 (file)
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -191,6 +191,8 @@ CONFIG_NET_CLS_BPF=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_CLS_ACT=y
+CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_RFKILL=y