From 19e1cbd9f3dea865d5f7fe33487f24d7af5f3386 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Fri, 23 May 2014 18:54:26 +0200 Subject: [PATCH] meta-digi-arm: linux-dey-3.10: Sync defconfigs for ccimx6sbc and ccimx6adpt Signed-off-by: Alex Gonzalez --- .../linux/linux-dey-3.10/ccimx6adpt/defconfig | 9 ++++++++ .../linux/linux-dey-3.10/ccimx6sbc/defconfig | 23 +++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6adpt/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6adpt/defconfig index 2209f0713..2b586b7c1 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6adpt/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6adpt/defconfig @@ -160,12 +160,18 @@ CONFIG_REGULATOR_DA9063=y CONFIG_REGULATOR_PFUZE100=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_VIDEO_V4L2_INT_DEVICE=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=y # CONFIG_USB_GSPCA is not set CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y +CONFIG_VIDEO_MXC_CAPTURE=y +CONFIG_MXC_CAMERA_OV5642=y +CONFIG_MXC_CAMERA_OV5640_MIPI=y +CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=y CONFIG_VIDEO_MXC_IPU_OUTPUT=y +CONFIG_VIDEO_MXC_PXP_V4L2=y CONFIG_SOC_CAMERA=y CONFIG_VIDEO_MX3=y CONFIG_SOC_CAMERA_OV2640=y @@ -204,7 +210,9 @@ CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_HDMI=y CONFIG_USB=y +CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y @@ -223,6 +231,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y CONFIG_MXC_ASRC=y +CONFIG_MXC_MIPI_CSI2=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_DA9063=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6sbc/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6sbc/defconfig index ba63272ea..db68b40f8 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6sbc/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccimx6sbc/defconfig @@ -26,6 +26,7 @@ CONFIG_VMSPLIT_2G=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set +CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CPU_FREQ=y @@ -70,7 +71,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set CONFIG_CMA=y -CONFIG_CMA_SIZE_MBYTES=256 +CONFIG_CMA_SIZE_MBYTES=320 CONFIG_IMX_WEIM=y CONFIG_CONNECTOR=y CONFIG_PROC_DEVICETREE=y @@ -116,6 +117,7 @@ CONFIG_TOUCHSCREEN_FUSION_7_10=y CONFIG_TOUCHSCREEN_MC13783=y CONFIG_INPUT_MISC=y CONFIG_INPUT_MMA8450=y +CONFIG_INPUT_DA9063_ONKEY=y CONFIG_INPUT_ISL29023=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set @@ -129,8 +131,6 @@ CONFIG_HW_RANDOM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y # CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_ALGOPCF=m -CONFIG_I2C_ALGOPCA=m CONFIG_I2C_IMX=y CONFIG_SPI=y CONFIG_SPI_IMX=y @@ -159,11 +159,18 @@ CONFIG_REGULATOR_DA9063=y CONFIG_REGULATOR_PFUZE100=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_VIDEO_V4L2_INT_DEVICE=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS=y +# CONFIG_USB_GSPCA is not set CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y +CONFIG_VIDEO_MXC_CAPTURE=y +CONFIG_MXC_CAMERA_OV5642=y +CONFIG_MXC_CAMERA_OV5640_MIPI=y +CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=y CONFIG_VIDEO_MXC_IPU_OUTPUT=y +CONFIG_VIDEO_MXC_PXP_V4L2=y CONFIG_SOC_CAMERA=y CONFIG_VIDEO_MX3=y CONFIG_SOC_CAMERA_OV2640=y @@ -202,7 +209,9 @@ CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_HDMI=y CONFIG_USB=y +CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y @@ -221,6 +230,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y CONFIG_MXC_ASRC=y +CONFIG_MXC_MIPI_CSI2=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_DA9063=y @@ -266,8 +276,3 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=m -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=m -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m