From f0212822faa9e206797fcdd538806d2e83a39bb1 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Fri, 14 Feb 2020 13:35:21 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Disable SDCARD_FS Move SDCARD_FS into the fragments for cuttlefish and db845c as this feature is still being used by AOSP master. These will be removed later. Bug: 149410031 Change-Id: I9142338cd0709aa8ec067b9e7d8c22390630de02 Signed-off-by: Alistair Delva --- arch/arm64/configs/db845c_gki.fragment | 1 + arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - cuttlefish.fragment | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment index c8b7fc3c3cd1..dde45fc3dda0 100644 --- a/arch/arm64/configs/db845c_gki.fragment +++ b/arch/arm64/configs/db845c_gki.fragment @@ -62,3 +62,4 @@ CONFIG_PHY_QCOM_USB_HS=m CONFIG_QCOM_QFPROM=m CONFIG_INTERCONNECT_QCOM=y CONFIG_INTERCONNECT_QCOM_SDM845=m +CONFIG_SDCARD_FS=m diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index af9809c6bd53..6d879cb4b520 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -406,7 +406,6 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y # CONFIG_EFIVAR_FS is not set -CONFIG_SDCARD_FS=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_RAM=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 7e2ca8755d9d..4316916f73a5 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -342,7 +342,6 @@ CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y # CONFIG_EFIVAR_FS is not set -CONFIG_SDCARD_FS=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_RAM=y diff --git a/cuttlefish.fragment b/cuttlefish.fragment index 3c374a866e4c..9c59fb302cbc 100644 --- a/cuttlefish.fragment +++ b/cuttlefish.fragment @@ -18,3 +18,4 @@ CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_TEST_STACKINIT=m CONFIG_TEST_MEMINIT=m +CONFIG_SDCARD_FS=m