summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinyu Chen <xinyu.chen@freescale.com>2012-04-26 11:01:34 +0800
committerXinyu Chen <xinyu.chen@freescale.com>2012-04-26 13:32:33 +0800
commitf0296db9bf2f19ca31eefb66b79e403ad36493ad (patch)
tree677ae558163557986ce890185e074fcbcf28db83
parent5463f103cf6a23876e3c3969ee0602b23ae50475 (diff)
ENGR00180865-4 defconfig: Add imx ion allocator support
Enable ION and imx ION driver Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
-rw-r--r--arch/arm/configs/imx6_android_defconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig
index a7fe67a17995..bd4659740039 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -305,6 +305,8 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_PM=y
CONFIG_IMX_HAVE_PLATFORM_IMX_ASRC=y
CONFIG_IMX_HAVE_PLATFORM_IMX_MIPI_DSI=y
CONFIG_IMX_HAVE_PLATFORM_IMX_MIPI_CSI2=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_VDOA=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_PCIE=y
#
# Freescale MXC Implementations
@@ -1018,7 +1020,6 @@ CONFIG_BLK_DEV_LOOP=y
# CONFIG_SENSORS_LIS3LV02D is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
-CONFIG_ANDROID_PMEM=y
# CONFIG_INTEL_MID_PTI is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
@@ -1863,7 +1864,8 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
# Graphics support
#
# CONFIG_DRM is not set
-# CONFIG_ION is not set
+CONFIG_ION=y
+CONFIG_ION_MXC=y
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y