13 files changed, 176 insertions, 29 deletions

diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 6b71514..fcdd6da 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 7767b79..0d69898 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -20,17 +20,16 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
+include conf/distro/include/toradex.inc
 
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \
     u-boot-${MACHINE}.imx:u-boot.imx \
+    flash_mmc-${MACHINE}.img:flash_mmc.img \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy"
 
-PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.9-1.0.0-hfp"
-PREFERRED_VERSION_imx-lib = "3.10.9-1.0.0"
-
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
@@ -46,7 +45,5 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         libgles2-mx6-dev \
         "
 
-ADB_PRODUCTID = "0x0000"
-
 SERIAL_CONSOLES = "115200;ttymxc0 \
                    115200;ttymxc1"
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 382ed68..87c986c 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 6e678e8..96662d6 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -15,8 +15,6 @@
 ## contact form at http://www.qt.io
 ##
 ############################################################################
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
@@ -26,6 +24,14 @@ BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy"
 
 EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
 
+PREFERRED_VERSION_libgles-omap3 = "4.10.00.01"
+PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
+
+PREFERRED_PROVIDER_u-boot = "u-boot"
+EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
+UBOOT_MACHINE = "am335x_boneblack_config"
+KERNEL_IMAGETYPE = "zImage"
+
 MACHINE_EXTRA_INSTALL = "\
         libgles-omap3 \
         libgles-omap3-rawdemos \
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
new file mode 100644
index 0000000..df85419
--- /dev/null
+++ b/conf/distro/include/colibri-vf.conf
@@ -0,0 +1,40 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+include conf/distro/include/toradex.inc
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
+SERIAL_CONSOLES = "115200;ttymxc0 \
+                   115200;ttymxc1"
+
+MACHINE_EXTRA_INSTALL = "\
+        opengldummy \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = "\
+        opengldummy-dev \
+        "
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index 91d79cb..3888cc5 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,12 +32,9 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 kernel_autoload_snd-intel8x0 = "snd-intel8x0"
 
 MACHINE_EXTRA_INSTALL = "\
-        libegl-mesa \
-        libgles2-mesa \
         mount-vboxsf \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = "\
-        libegl-mesa-dev \
-        libgles2-mesa-dev \
+        qtglesstream-dummy-client-dev \
         "
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index 64ecadb..39c4688 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
diff --git a/conf/distro/include/imx6dlsabresd.conf b/conf/distro/include/imx6dlsabresd.conf
new file mode 100644
index 0000000..7a209ed
--- /dev/null
+++ b/conf/distro/include/imx6dlsabresd.conf
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+require imx6qsabresd.conf
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 3d92a6b..0323a42 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -20,25 +20,31 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz ext3 sdcard"
-
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-sabresd.dtb:imx6dl-sabresd.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-sabresd-hdcp.dtb:imx6dl-sabresd-hdcp.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-sabresd-ldo.dtb:imx6dl-sabresd-ldo.dtb \
     u-boot-${MACHINE}.imx:u-boot.imx \
     "
-BOOTFS_DEPENDS = "u-boot:do_deploy"
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 
-PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp"
 PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
 
+DISTRO_FEATURES_DEFAULT += "wayland"
+
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
         libgles2-mx6 \
         gst-fsl-plugin \
+        wayland \
+        weston \
+        weston-examples \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
@@ -47,6 +53,17 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         libegl-mx6-dev \
         libgles2-mx6 \
         libgles2-mx6-dev \
+        libwayland-egl-mx6-dev \
         "
 
-ADB_PRODUCTID = "0x0000"
+MACHINE_EXTRA_INSTALL_SDK_HOST = "\
+        wayland-nativesdk \
+        "
+
+module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture"
+
+# add support for both imx6qsabresd and imx6dlsabresd
+KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
+                     imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
+                    "
+MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index aa00b5f..266e95d 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -20,28 +20,45 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
     ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:imx6dl-nitrogen6_max.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \
     6x_bootscript-${MACHINE}:6x_bootscript \
     6x_upgrade-${MACHINE}:6x_upgrade \
+    ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:update/imx6dl-nitrogen6_max.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \
+    update/platform:update/platform \
     "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy b2qt-update-framework:do_deploy"
 
 EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
-PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp"
 PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
 
+KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb"
+
+DISTRO_FEATURES_DEFAULT += "wayland"
+
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
         libgles2-mx6 \
         gst-fsl-plugin \
+        wayland \
+        weston \
+        weston-examples \
+        bcm4330-nvram-config \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
@@ -50,6 +67,13 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         libegl-mx6-dev \
         libgles2-mx6 \
         libgles2-mx6-dev \
+        libwayland-egl-mx6-dev \
         "
 
+MACHINE_EXTRA_INSTALL_SDK_HOST = "\
+        wayland-nativesdk \
+        "
+
+B2QT_PLATFORM = "iMX6-eLinux"
+
 ADB_PRODUCTID = "0x0d02"
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index ebc32d7..33f3728 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     bcm2835-bootfiles/*: \
     ${KERNEL_IMAGETYPE}:kernel.img \
@@ -39,6 +37,10 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         "
 
 module_autoload_snd-bcm2835 = "snd-bcm2835"
+module_autoload_bcm2835-v4l2 = "bcm2835-v4l2"
+module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
 
 # additional memory for GPU
 GPU_MEM = "128"
+# video camera support
+VIDEO_CAMERA = "1"
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
new file mode 100644
index 0000000..1e5e7e0
--- /dev/null
+++ b/conf/distro/include/tibidabo.conf
@@ -0,0 +1,46 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    bootscript:bootscript \
+    "
+BOOTFS_DEPENDS = "tibidabo-bootscript-sd:do_deploy virtual/kernel:do_deploy"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+
+module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture"
+
+BBMASK += "|meta-fsl-extras/recipes/u-boot|meta-fsl-extras/recipes/linux/linux-boundary|meta-fsl-extras/recipes/broadcom-nvram-config"
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
new file mode 100644
index 0000000..616b77f
--- /dev/null
+++ b/conf/distro/include/toradex.inc
@@ -0,0 +1 @@
+BBMASK += "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear"