From 91a9586afeb175ed4dd0eca3acbe67f7e946bce0 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 2 Dec 2013 18:12:44 +0100 Subject: [PATCH] meta-digi-arm: disable camera 2 on MX5 as it conflicts with VGA https://jira.digi.com/browse/DEL-881 Signed-off-by: Javier Viguera --- .../ccimx51js/config-camera-module.cfg | 10 ---------- .../ccimx53js/config-camera-module.cfg | 11 ----------- 2 files changed, 21 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/config-camera-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/config-camera-module.cfg index 23ae4ff7b..0cd1918a3 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/config-camera-module.cfg +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx51js/config-camera-module.cfg @@ -1,17 +1,7 @@ CONFIG_VIDEO_MXC_CAMERA=y CONFIG_VIDEO_MXC_IPU_CAMERA=y -# CONFIG_VIDEO_MXC_CSI_CAMERA is not set -# CONFIG_MXC_CAMERA_MC521DA is not set -# CONFIG_MXC_EMMA_CAMERA_MICRON111 is not set -# CONFIG_MXC_CAMERA_OV2640_EMMA is not set CONFIG_MXC_CAMERA_MICRON111=m CONFIG_MXC_CAMERA_MICRON111_1=m -CONFIG_MXC_CAMERA_MICRON111_2=m -# CONFIG_MXC_CAMERA_OV2640 is not set -# CONFIG_MXC_CAMERA_OV3640 is not set -# CONFIG_MXC_CAMERA_OV5640 is not set -# CONFIG_MXC_CAMERA_OV5642 is not set -# CONFIG_MXC_TVIN_ADV7180 is not set CONFIG_MXC_IPU_PRP_VF_SDC=y CONFIG_MXC_IPU_PRP_ENC=y CONFIG_MXC_IPU_CSI_ENC=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/config-camera-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/config-camera-module.cfg index bf55f3bc8..0cd1918a3 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/config-camera-module.cfg +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-2.6.35.14/ccimx53js/config-camera-module.cfg @@ -1,18 +1,7 @@ CONFIG_VIDEO_MXC_CAMERA=y CONFIG_VIDEO_MXC_IPU_CAMERA=y -# CONFIG_VIDEO_MXC_CSI_CAMERA is not set -# CONFIG_MXC_CAMERA_MC521DA is not set -# CONFIG_MXC_EMMA_CAMERA_MICRON111 is not set -# CONFIG_MXC_CAMERA_OV2640_EMMA is not set CONFIG_MXC_CAMERA_MICRON111=m CONFIG_MXC_CAMERA_MICRON111_1=m -CONFIG_MXC_CAMERA_MICRON111_2=m -# CONFIG_MXC_CAMERA_OV2640 is not set -# CONFIG_MXC_CAMERA_OV3640 is not set -# CONFIG_MXC_CAMERA_OV5640 is not set -# CONFIG_MXC_CAMERA_OV5642 is not set -# CONFIG_MXC_TVIN_ADV7180 is not set CONFIG_MXC_IPU_PRP_VF_SDC=y CONFIG_MXC_IPU_PRP_ENC=y CONFIG_MXC_IPU_CSI_ENC=y -