| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Ram Muthiah <rammuthiah@google.com> |
| Date: Thu, 29 Aug 2019 19:15:01 -0700 |
| Subject: ANDROID: first pass cuttlefish GKI modularization |
| |
| Bug: 132629930 |
| Signed-off-by: Ram Muthiah <rammuthiah@google.com> |
| Change-Id: Ie2a4d08596b0e2af7c868224bc18dcd6adae7ee0 |
| --- |
| arch/x86/configs/gki_defconfig | 28 ++++++++++++++++------------ |
| 1 file changed, 16 insertions(+), 12 deletions(-) |
| |
| diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig |
| index 6b0ff4ca236a..a37fa09bd107 100644 |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -155,8 +155,12 @@ 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_VSOCKETS=m |
| +CONFIG_VIRTIO_VSOCKETS=m |
| +CONFIG_CAN=m |
| +# CONFIG_CAN_BCM is not set |
| +# CONFIG_CAN_GW is not set |
| +CONFIG_CAN_VCAN=m |
| CONFIG_CFG80211=y |
| # CONFIG_CFG80211_DEFAULT_PS is not set |
| # CONFIG_CFG80211_CRDA_SUPPORT is not set |
| @@ -170,7 +174,7 @@ CONFIG_ZRAM=y |
| CONFIG_BLK_DEV_LOOP=y |
| CONFIG_BLK_DEV_RAM=y |
| CONFIG_BLK_DEV_RAM_SIZE=8192 |
| -CONFIG_VIRTIO_BLK=y |
| +CONFIG_VIRTIO_BLK=m |
| CONFIG_UID_SYS_STATS=y |
| CONFIG_SCSI=y |
| # CONFIG_SCSI_PROC_FS is not set |
| @@ -185,7 +189,7 @@ CONFIG_DM_VERITY_FEC=y |
| CONFIG_DM_BOW=y |
| CONFIG_NETDEVICES=y |
| CONFIG_TUN=y |
| -CONFIG_VIRTIO_NET=y |
| +CONFIG_VIRTIO_NET=m |
| # CONFIG_ETHERNET is not set |
| CONFIG_PHYLIB=y |
| CONFIG_PPP=y |
| @@ -219,7 +223,7 @@ CONFIG_USB_USBNET=y |
| # CONFIG_WLAN_VENDOR_TI is not set |
| # CONFIG_WLAN_VENDOR_ZYDAS is not set |
| # CONFIG_WLAN_VENDOR_QUANTENNA is not set |
| -CONFIG_VIRT_WIFI=y |
| +CONFIG_VIRT_WIFI=m |
| CONFIG_INPUT_EVDEV=y |
| # CONFIG_INPUT_KEYBOARD is not set |
| # CONFIG_INPUT_MOUSE is not set |
| @@ -236,9 +240,8 @@ CONFIG_SERIAL_8250_NR_UARTS=48 |
| CONFIG_SERIAL_8250_EXTENDED=y |
| CONFIG_SERIAL_8250_MANY_PORTS=y |
| CONFIG_SERIAL_8250_SHARE_IRQ=y |
| -CONFIG_VIRTIO_CONSOLE=y |
| CONFIG_HW_RANDOM=y |
| -CONFIG_HW_RANDOM_VIRTIO=y |
| +CONFIG_HW_RANDOM_VIRTIO=m |
| # CONFIG_I2C_COMPAT is not set |
| # CONFIG_I2C_HELPER_AUTO is not set |
| CONFIG_SPI=y |
| @@ -250,7 +253,7 @@ CONFIG_MEDIA_SUPPORT=y |
| CONFIG_MEDIA_CAMERA_SUPPORT=y |
| CONFIG_DRM=y |
| # CONFIG_DRM_FBDEV_EMULATION is not set |
| -CONFIG_DRM_VIRTIO_GPU=y |
| +CONFIG_DRM_VIRTIO_GPU=m |
| # CONFIG_LCD_CLASS_DEVICE is not set |
| CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| CONFIG_SOUND=y |
| @@ -260,6 +263,7 @@ CONFIG_SND_DYNAMIC_MINORS=y |
| # CONFIG_SND_SUPPORT_OLD_API is not set |
| # CONFIG_SND_VERBOSE_PROCFS is not set |
| # CONFIG_SND_DRIVERS is not set |
| +CONFIG_SND_INTEL8X0=m |
| # CONFIG_SND_USB is not set |
| CONFIG_HIDRAW=y |
| CONFIG_UHID=y |
| @@ -285,9 +289,10 @@ CONFIG_LEDS_CLASS=y |
| CONFIG_LEDS_TRIGGERS=y |
| CONFIG_RTC_CLASS=y |
| # CONFIG_RTC_SYSTOHC is not set |
| -CONFIG_VIRTIO_PCI=y |
| -CONFIG_VIRTIO_INPUT=y |
| -CONFIG_VIRTIO_MMIO=y |
| +CONFIG_RTC_DRV_TEST=m |
| +CONFIG_VIRTIO_PCI=m |
| +CONFIG_VIRTIO_INPUT=m |
| +CONFIG_VIRTIO_MMIO=m |
| CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y |
| CONFIG_STAGING=y |
| CONFIG_ASHMEM=y |
| @@ -325,7 +330,6 @@ CONFIG_CRYPTO_SHA512=y |
| CONFIG_CRYPTO_LZ4=y |
| CONFIG_CRYPTO_ZSTD=y |
| CONFIG_CRYPTO_ANSI_CPRNG=y |
| -CONFIG_CRYPTO_DEV_VIRTIO=y |
| CONFIG_CRC8=y |
| CONFIG_XZ_DEC=y |
| CONFIG_DMA_CMA=y |
