summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-10-13 16:18:20 +0300
committerSamuli Piippo <samuli.piippo@digia.com>2014-10-17 09:54:04 +0300
commit938e7b50ca198ffb05d8fcb393d5c42f3a1bb3f7 (patch)
treed583094f6e4902d1251c62f3666fe9be19745278 /conf
parentb8caaf7e86f2417d2abbeb30c71ce4bb1f11883c (diff)
downloadmeta-boot2qt-938e7b50ca198ffb05d8fcb393d5c42f3a1bb3f7.tar.gz
Add camera support for RPi and SABRE
Include necessary gstreamer plugins to enable camera usage in Qt. Camera is enabled in RPi boot configuration, and needed kernel modules are loaded during boot on in RPi and SABRE. Change-Id: Iaeb17933b7d7dabb30db638db6594ab6aada05a0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/imx6qsabresd.conf4
-rw-r--r--conf/distro/include/raspberrypi.conf4
2 files changed, 7 insertions, 1 deletions
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 4aae29e..2faf285 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -29,7 +29,7 @@ BOOTFS_CONTENT = "\
29 ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \ 29 ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \
30 u-boot-${MACHINE}.imx:u-boot.imx \ 30 u-boot-${MACHINE}.imx:u-boot.imx \
31 " 31 "
32BOOTFS_DEPENDS = "u-boot:do_deploy" 32BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
33 33
34PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" 34PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp"
35PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" 35PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
@@ -59,4 +59,6 @@ MACHINE_EXTRA_INSTALL_SDK_HOST = "\
59 wayland-nativesdk \ 59 wayland-nativesdk \
60 " 60 "
61 61
62module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture"
63
62ADB_PRODUCTID = "0x0000" 64ADB_PRODUCTID = "0x0000"
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 61cebb4..d0a400e 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -39,6 +39,10 @@ MACHINE_EXTRA_INSTALL_SDK = " \
39 " 39 "
40 40
41module_autoload_snd-bcm2835 = "snd-bcm2835" 41module_autoload_snd-bcm2835 = "snd-bcm2835"
42module_autoload_bcm2835-v4l2 = "bcm2835-v4l2"
43module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
42 44
43# additional memory for GPU 45# additional memory for GPU
44GPU_MEM = "128" 46GPU_MEM = "128"
47# video camera support
48VIDEO_CAMERA = "1"