diff options
| author | Terry Lv <r65388@freescale.com> | 2011-08-16 16:04:44 +0800 |
|---|---|---|
| committer | Terry Lv <r65388@freescale.com> | 2011-08-16 17:01:32 +0800 |
| commit | b3f710aa160a9d190c7d6800f74f2da490a048d5 (patch) | |
| tree | 7a4cbcdad3a1e0e832c2e96d9bc56c071d9de9a0 /arch/arm/configs | |
| parent | fc8e7f42bff479718cd40ee37c1dea4434a9e9cb (diff) | |
ENGR00154889-1: Add virtual iim driver to imx5 and imx6 platform
This patch adds platform changes to system files, including:
1. Add viim platform deivce.
2. Add viim menu.
Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 3ef30a90b404..7c19d2bc8840 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 27 13:18:10 2011 +# Tue Aug 16 14:53:37 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -270,6 +270,7 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_IPUV3=y CONFIG_IMX_HAVE_PLATFORM_IMX_VPU=y CONFIG_IMX_HAVE_PLATFORM_AHCI=y CONFIG_IMX_HAVE_PLATFORM_IMX_OCOTP=y +CONFIG_IMX_HAVE_PLATFORM_IMX_VIIM=y CONFIG_IMX_HAVE_PLATFORM_LDB=y CONFIG_IMX_HAVE_PLATFORM_VIV_GPU=y CONFIG_IMX_HAVE_PLATFORM_MXC_HDMI=y @@ -290,6 +291,7 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_ASRC=y # CONFIG_ARCH_MX5 is not set CONFIG_ARCH_MX6=y CONFIG_FORCE_MAX_ZONEORDER=13 +CONFIG_DMA_ZONE_SIZE=96 CONFIG_ARCH_MX6Q=y CONFIG_SOC_IMX6Q=y CONFIG_MACH_MX6Q_SABREAUTO=y @@ -303,7 +305,6 @@ CONFIG_MXC_PWM=y # CONFIG_MXC_DEBUG_BOARD is not set CONFIG_ARCH_MXC_IOMUX_V3=y CONFIG_IRAM_ALLOC=y -CONFIG_DMA_ZONE_SIZE=96 CONFIG_CLK_DEBUG=y # @@ -1023,6 +1024,7 @@ CONFIG_HW_RANDOM=y # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set # CONFIG_RAMOOPS is not set +CONFIG_MXS_VIIM=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y |