summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSammy He <r62914@freescale.com>2011-07-14 20:07:14 +0800
committerSammy He <r62914@freescale.com>2011-07-14 20:09:40 +0800
commit5e6767473e0c9cbebe627ba0e0acd06d5e156bbc (patch)
tree4d814292bf7dce06f1d2a99728482ef1243aec3f /arch
parent4cc7ee2eb25ca80fb044fef7ef23167daacd7a40 (diff)
ENGR00152371-3 imx6_defconfig: enable vpu config
Enable CONFIG_IMX_HAVE_PLATFORM_IMX_VPU and CONFIG_MXC_VPU for imx6q. Signed-off-by: Sammy He <r62914@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/imx6_defconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index e810c81c31e9..11955f810907 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38 Kernel Configuration
-# Wed Jul 13 14:27:14 2011
+# Thu Jul 14 19:45:47 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -260,6 +260,7 @@ CONFIG_IMX_HAVE_PLATFORM_MXC_PWM=y
CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX=y
CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
CONFIG_IMX_HAVE_PLATFORM_IMX_IPUV3=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_VPU=y
CONFIG_IMX_HAVE_PLATFORM_AHCI=y
CONFIG_IMX_HAVE_PLATFORM_LDB=y
CONFIG_IMX_HAVE_PLATFORM_VIV_GPU=y
@@ -1662,6 +1663,8 @@ CONFIG_MXC_IPU_V3H=y
#
# MXC VPU(Video Processing Unit) support
#
+CONFIG_MXC_VPU=y
+# CONFIG_MXC_VPU_DEBUG is not set
#
# MXC Asynchronous Sample Rate Converter support