From: Sammy He <r62914@freescale.com>
Date: Thu, 14 Jul 2011 12:07:14 +0000 (+0800)
Subject: ENGR00152371-3 imx6_defconfig: enable vpu config
X-Git-Tag: v3.0.35-fsl_4.1.0~2426
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9b856d3f5b48ad09f0e1efb8f551ccc393f926d;p=karo-tx-linux.git

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>
---

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