From b71d8395d5654e34044d8f2576c33ec82d6a232a Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 25 Feb 2013 09:59:55 +0100 Subject: [PATCH] meta-digi: Add camera support kernel configuration and module autoloading. Signed-off-by: Alex Gonzalez --- meta-digi-arm/conf/machine/ccimx51js.conf | 2 ++ meta-digi-arm/conf/machine/ccimx53js.conf | 2 ++ .../linux/linux-del_2.6.35.14.bb | 2 +- .../ccimx51js/config-camera-module.cfg | 18 ++++++++++++++++++ .../ccimx53js/config-camera-module.cfg | 18 ++++++++++++++++++ .../del-examples/del-examples-v4l2.bb | 2 ++ 6 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-camera-module.cfg create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-camera-module.cfg diff --git a/meta-digi-arm/conf/machine/ccimx51js.conf b/meta-digi-arm/conf/machine/ccimx51js.conf index 23852b2a1..e6a6d1462 100644 --- a/meta-digi-arm/conf/machine/ccimx51js.conf +++ b/meta-digi-arm/conf/machine/ccimx51js.conf @@ -20,9 +20,11 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" module_autoload_mma7455l = "mma7455l" module_autoload_scc2_driver = "scc2_driver" module_autoload_sahara = "sahara" +module_autoload_mt9v111_camera = "mt9v111_camera" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine" diff --git a/meta-digi-arm/conf/machine/ccimx53js.conf b/meta-digi-arm/conf/machine/ccimx53js.conf index d3bb7603a..2aa8a4125 100644 --- a/meta-digi-arm/conf/machine/ccimx53js.conf +++ b/meta-digi-arm/conf/machine/ccimx53js.conf @@ -19,9 +19,11 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" module_autoload_mma7455l = "mma7455l" module_autoload_scc2_driver = "scc2_driver" module_autoload_sahara = "sahara" +module_autoload_mt9v111_camera = "mt9v111_camera" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb index 43f5c562d..cd99ffba5 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb @@ -9,7 +9,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}_${PV}" SRCREV_mx5 = "${AUTOREV}" LOCALVERSION_mx5 = "mx5+master" -KERNEL_CFG_FRAGS_mx5 = "file://config-accel-module.cfg file://config-sahara-module.cfg" +KERNEL_CFG_FRAGS_mx5 = "file://config-accel-module.cfg file://config-sahara-module.cfg file://config-camera-module.cfg" SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \ file://defconfig \ ${KERNEL_CFG_FRAGS} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-camera-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-camera-module.cfg new file mode 100644 index 000000000..bf55f3bc8 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-camera-module.cfg @@ -0,0 +1,18 @@ +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-del_2.6.35.14/ccimx53js/config-camera-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-camera-module.cfg new file mode 100644 index 000000000..bf55f3bc8 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx53js/config-camera-module.cfg @@ -0,0 +1,18 @@ +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-del/recipes-digi/del-examples/del-examples-v4l2.bb b/meta-digi-del/recipes-digi/del-examples/del-examples-v4l2.bb index eeb59b759..6648f5772 100644 --- a/meta-digi-del/recipes-digi/del-examples/del-examples-v4l2.bb +++ b/meta-digi-del/recipes-digi/del-examples/del-examples-v4l2.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 PR = "r0" +RDEPENDS_${PN} = "kernel-module-mt9v111-camera" + SRC_URI = "file://v4l2_test" S = "${WORKDIR}/v4l2_test"