diff options
| author | Xinyu Chen <b03824@freescale.com> | 2011-08-23 13:39:10 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2011-08-23 13:39:10 +0800 |
| commit | 3a4da07bee7d4f8f288392701ce416546f50c619 (patch) | |
| tree | 2952ab4ac85d2193696399196241a213f77c8e93 | |
| parent | 6dee1bc7106cb366562ead7c0983f8975ecc253d (diff) | |
Add HDMI support into the defconfig
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
| -rw-r--r-- | arch/arm/configs/imx6_android_defconfig | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig index d264975d7be3..80260080f4d9 100644 --- a/arch/arm/configs/imx6_android_defconfig +++ b/arch/arm/configs/imx6_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.38 Kernel Configuration -# Wed Aug 10 13:23:56 2011 +# Tue Aug 23 13:38:32 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -275,8 +275,10 @@ CONFIG_ARCH_MXC=y # CONFIG_ARCH_OMAP is not set # CONFIG_PLAT_SPEAR is not set CONFIG_GPIO_PCA953X=y +CONFIG_IMX_HAVE_PLATFORM_DMA=y CONFIG_IMX_HAVE_PLATFORM_FEC=y CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y +CONFIG_IMX_HAVE_PLATFORM_GPMI_NFC=y CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y CONFIG_IMX_HAVE_PLATFORM_IMX_SNVS_RTC=y CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y @@ -290,6 +292,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 @@ -489,7 +492,6 @@ CONFIG_WAKELOCK_STAT=y CONFIG_USER_WAKELOCK=y CONFIG_EARLYSUSPEND=y # CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set -# CONFIG_CONSOLE_EARLYSUSPEND is not set CONFIG_FB_EARLYSUSPEND=y CONFIG_APM_EMULATION=y CONFIG_PM_RUNTIME=y @@ -880,6 +882,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_GPMI_NFC is not set # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ALAUDA is not set # CONFIG_MTD_ONENAND is not set @@ -1260,6 +1263,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 is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y @@ -1573,7 +1577,7 @@ CONFIG_FB_MXC_LDB=y # CONFIG_FB_MXC_ASYNC_PANEL is not set # CONFIG_FB_MXC_EINK_PANEL is not set # CONFIG_FB_MXC_ELCDIF_FB is not set -# CONFIG_FB_MXC_HDMI is not set +CONFIG_FB_MXC_HDMI=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y @@ -1798,12 +1802,12 @@ CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_ARC=y +CONFIG_USB_ARC=y # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_R8A66597 is not set # CONFIG_USB_GADGET_PXA_U2O is not set # CONFIG_USB_GADGET_M66592 is not set -CONFIG_USB_GADGET_ARC=y -CONFIG_USB_ARC=y # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set @@ -1954,6 +1958,7 @@ CONFIG_DMADEVICES=y # CONFIG_MXC_PXP is not set # CONFIG_TIMB_DMA is not set CONFIG_IMX_SDMA=y +# CONFIG_MXS_DMA is not set CONFIG_DMA_ENGINE=y # |