diff options
| author | Even Xu <Feng.Xu@freescale.com> | 2011-11-09 16:06:28 +0800 |
|---|---|---|
| committer | Even Xu <Feng.Xu@freescale.com> | 2011-11-09 17:35:48 +0800 |
| commit | 80e8ae04539b0f32ad2d002dd65a245c2ba52d05 (patch) | |
| tree | 4f856249846cf07bd9d015a7da53560eb47ffb6d /arch/arm/configs | |
| parent | 736510c6a54e8ba9930fa9c4a75434e510af643a (diff) | |
ENGR00161766 [MX6] change ov5640_mipi to a module
1. Config MIPI CSI2 driver as a default build in driver
2. Change ov5640 mipi sensor as a module
Signed-off-by: Even Xu <b21019@freescale.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 66919896cd6f..cc21f4500af0 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 -# Fri Nov 4 16:16:41 2011 +# Wed Nov 9 15:44:43 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -287,6 +287,7 @@ CONFIG_IMX_HAVE_PLATFORM_FSL_USB_WAKEUP=y 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 # # Freescale MXC Implementations @@ -1270,6 +1271,8 @@ CONFIG_MEDIA_TUNER_XC2028=y CONFIG_MEDIA_TUNER_XC5000=y CONFIG_MEDIA_TUNER_MC44S803=y CONFIG_VIDEO_V4L2=y +CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_DMA_CONTIG=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set @@ -1359,6 +1362,7 @@ CONFIG_VIDEO_MXC_IPU_CAMERA=y # CONFIG_MXC_CAMERA_OV2640 is not set CONFIG_MXC_CAMERA_OV3640=m CONFIG_MXC_CAMERA_OV5640=m +CONFIG_MXC_CAMERA_OV5640_MIPI=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_IPU_PRP_VF_SDC=m CONFIG_MXC_IPU_PRP_ENC=m @@ -1692,7 +1696,6 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_ARC=y -# CONFIG_USB_STATIC_IRAM_PPH is not set CONFIG_USB_ARC=y # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_R8A66597 is not set @@ -1984,6 +1987,11 @@ CONFIG_MXC_GPU_VIV=y # CONFIG_ANATOP_THERMAL is not set # +# MXC MIPI Support +# +CONFIG_MXC_MIPI_CSI2=y + +# # File systems # CONFIG_EXT2_FS=y |