From 64302bc801132ef90fff0073f5fb586a9b77c2a2 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Tue, 8 Aug 2023 09:22:10 -0700 Subject: [PATCH] ANDROID: GKI: move virtual device related cfgs out All of these are virtual device specific and bloat GKI. Let's remove them and load them as modules for all virtual device users of GKI. Bug: 182417593 Change-Id: I8e99a1f737635d49bc23e7f36098aa725df6c6c4 Signed-off-by: Ram Muthiah --- arch/arm64/configs/gki_defconfig | 3 --- arch/riscv/configs/gki_defconfig | 3 --- arch/x86/configs/gki_defconfig | 3 --- 3 files changed, 9 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 2267a5bc4cca..900cdfc856f4 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -258,7 +258,6 @@ CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_NET_ACT_SKBEDIT=y CONFIG_NET_ACT_BPF=y -CONFIG_VSOCKETS=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CAN=m CONFIG_BT=m @@ -533,7 +532,6 @@ CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL031=y CONFIG_DMABUF_HEAPS=y CONFIG_UIO=y -CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y CONFIG_ASHMEM=y CONFIG_COMMON_CLK_SCPI=y @@ -576,7 +574,6 @@ CONFIG_FS_VERITY=y CONFIG_QUOTA=y CONFIG_QFMT_V2=y CONFIG_FUSE_FS=y -CONFIG_VIRTIO_FS=y CONFIG_OVERLAY_FS=y CONFIG_INCREMENTAL_FS=y CONFIG_MSDOS_FS=y diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig index 7d9db5dec740..43c8db8e5fd6 100644 --- a/arch/riscv/configs/gki_defconfig +++ b/arch/riscv/configs/gki_defconfig @@ -238,7 +238,6 @@ CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_NET_ACT_SKBEDIT=y CONFIG_NET_ACT_BPF=y -CONFIG_VSOCKETS=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CAN=m CONFIG_BT=m @@ -486,7 +485,6 @@ CONFIG_EDAC=y CONFIG_RTC_CLASS=y CONFIG_DMABUF_HEAPS=y CONFIG_UIO=y -CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y CONFIG_ASHMEM=y # CONFIG_SUNXI_CCU is not set @@ -526,7 +524,6 @@ CONFIG_FS_VERITY=y CONFIG_QUOTA=y CONFIG_QFMT_V2=y CONFIG_FUSE_FS=y -CONFIG_VIRTIO_FS=y CONFIG_OVERLAY_FS=y CONFIG_INCREMENTAL_FS=y CONFIG_MSDOS_FS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 62c9ba4152b4..dec10e33b6fd 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -256,7 +256,6 @@ CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_NET_ACT_SKBEDIT=y CONFIG_NET_ACT_BPF=y -CONFIG_VSOCKETS=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CAN=m CONFIG_BT=m @@ -499,7 +498,6 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set CONFIG_DMABUF_HEAPS=y CONFIG_UIO=y -CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y CONFIG_ASHMEM=y CONFIG_REMOTEPROC=y @@ -529,7 +527,6 @@ CONFIG_FS_VERITY=y CONFIG_QUOTA=y CONFIG_QFMT_V2=y CONFIG_FUSE_FS=y -CONFIG_VIRTIO_FS=y CONFIG_OVERLAY_FS=y CONFIG_INCREMENTAL_FS=y CONFIG_MSDOS_FS=y