Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eed5d49 authored by Ram Muthiah's avatar Ram Muthiah Committed by Alistair Delva
Browse files

ANDROID: gki_defconfig: =m's applied for virtio configs in arm64 



aligned =m virtual dev configs for arm64 and 86_64

Test: Treehugger
Bug: 143710295
Change-Id: I77c8b838bec94cf5ad3f0dc124f8269c2b6d6636
Signed-off-by: default avatarRam Muthiah <rammuthiah@google.com>
(cherry picked from commit 2e1635f514da5533794f9c4772d12d5d30dd55fe)
parent 937f4b0b

arch/arm64/configs/gki_defconfig

+14 −12
Original line number Diff line number Diff line
@@ -189,9 +189,11 @@ 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_BPF_JIT=y

CONFIG_CAN=m

CONFIG_CAN_VCAN=m

CONFIG_BT=y

CONFIG_CFG80211=y

# CONFIG_CFG80211_DEFAULT_PS is not set
@@ -208,7 +210,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
@@ -227,7 +229,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
@@ -261,7 +263,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_FF_MEMLESS=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y
@@ -280,9 +282,9 @@ CONFIG_SERIAL_OF_PLATFORM=m 
CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_VIRTIO=y

CONFIG_HW_RANDOM_VIRTIO=m

# CONFIG_HW_RANDOM_CAVIUM is not set

# CONFIG_DEVPORT is not set

# CONFIG_I2C_COMPAT is not set
@@ -307,7 +309,7 @@ CONFIG_MEDIA_CONTROLLER=y 
# CONFIG_VGA_ARB is not set

CONFIG_DRM=y

# CONFIG_DRM_FBDEV_EMULATION is not set

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_DRM_VIRTIO_GPU=m

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_HRTIMER=y
@@ -347,14 +349,15 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_EDAC=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_SYSTOHC is not set

CONFIG_RTC_DRV_TEST=m

CONFIG_RTC_DRV_PL030=y

CONFIG_RTC_DRV_PL031=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_PCI=m

# CONFIG_VIRTIO_PCI_LEGACY is not set

CONFIG_VIRTIO_INPUT=y

CONFIG_VIRTIO_MMIO=y

CONFIG_VIRTIO_INPUT=m

CONFIG_VIRTIO_MMIO=m

CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y
@@ -460,7 +463,6 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_LZ4=y

CONFIG_CRYPTO_ZSTD=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_VIRTIO=y

CONFIG_CRC_CCITT=y

CONFIG_CRC8=y

CONFIG_XZ_DEC=y

arch/x86/configs/gki_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ CONFIG_SERIAL_8250_CONSOLE=y 
# CONFIG_SERIAL_8250_EXAR is not set

CONFIG_SERIAL_OF_PLATFORM=m

CONFIG_SERIAL_DEV_BUS=y

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_VIRTIO=m

# CONFIG_DEVPORT is not set
@@ -298,6 +299,8 @@ CONFIG_USB_CONFIGFS_F_MIDI=y 
CONFIG_MMC=m

# CONFIG_PWRSEQ_EMMC is not set

# CONFIG_PWRSEQ_SIMPLE is not set

CONFIG_MMC_SDHCI=m

CONFIG_MMC_SDHCI_PLTFM=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y