summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJorge E. Moreira <jemoreira@google.com>2019-05-23 17:26:51 -0700
committerAmit Pundir <amit.pundir@linaro.org>2019-09-16 13:09:02 +0530
commit872a6e2ed8a64a82396b1d73d5a6f2db9a725b67 (patch)
tree8489705a947ea33f2f09aa835f239f69b3ed1b0b /arch
parent5155b8f6dba0825b2b22b5a0a7c82396448e1b0b (diff)
ANDROID: Enable CONFIG_ION_SYSTEM_HEAP
Bug: 132983011 Test: atest MediaStore_Video_ThumbnailsTest Signed-off-by: Jorge E. Moreira <jemoreira@google.com> Change-Id: I2211af2700439c14e7ff53ac5c7e45579d0ab8bf
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/configs/cuttlefish_defconfig1
-rw-r--r--arch/x86/configs/x86_64_cuttlefish_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig
index 4fb1903d3c8f..f52dd1a6a14d 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -393,6 +393,7 @@ CONFIG_STAGING=y
CONFIG_ASHMEM=y
CONFIG_ANDROID_VSOC=y
CONFIG_ION=y
+CONFIG_ION_SYSTEM_HEAP=y
CONFIG_COMMON_CLK_SCPI=y
# CONFIG_COMMON_CLK_XGENE is not set
CONFIG_MAILBOX=y
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig
index 03dfba434e4a..e3fde7b3fe56 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -416,6 +416,7 @@ CONFIG_STAGING=y
CONFIG_ASHMEM=y
CONFIG_ANDROID_VSOC=y
CONFIG_ION=y
+CONFIG_ION_SYSTEM_HEAP=y
# CONFIG_X86_PLATFORM_DEVICES is not set
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_ANDROID=y