19 files changed, 67 insertions, 109 deletions

diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index e0a77f6..d470daa 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -31,9 +31,9 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-fsl-arm \
   ${BSPDIR}/sources/meta-fsl-arm-extra \
-  ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index ac635d8..5e38e3c 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -24,7 +24,6 @@ include conf/distro/poky.conf
 
 DISTRO = "b2qt"
 DISTRO_NAME = "Boot to Qt for Embedded Linux"
-DISTRO_VERSION = "1.7"
 SDK_VERSION := "${DISTRO_VERSION}"
 
 MAINTAINER = "B2Qt <B2Qt@digia.com>"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index d8ae042..e1f6cfb 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -28,11 +28,13 @@ BOOTFS_DEPENDS = "u-boot:do_deploy"
 
 DISTRO_FEATURES_remove = "webengine"
 
+PREFERRED_VERSION_linux-ti-staging = "3.14%"
+
 PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
 
-PREFERRED_VERSION_libgles-omap3 = "5.01.01.01"
-PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.01"
+PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
+PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
 
 MACHINE_EXTRA_INSTALL = "\
         libgles-omap3 \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 819960d..0b41513 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -28,7 +28,6 @@ BOOTFS_CONTENT = "\
     ${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 \
@@ -38,7 +37,6 @@ BOOTFS_CONTENT = "\
     ${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 \
     "
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 5256eb4..167f3d4 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -1,2 +1,2 @@
 BBMASK ?= " "
-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|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls"
+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|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer"
diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
index 87326af..8a2fd54 100644
--- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
+++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
@@ -34,3 +34,6 @@ do_configure_prepend() {
     echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
     echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 }
+
+# bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
+PRINC = "-1"
diff --git a/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb b/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
index 73d4371..f72844e 100644
--- a/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
+++ b/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
@@ -23,3 +23,6 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
                  HOSTSTRIP=true'
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
+PRINC = "-1"
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
index 54ef15f..3424c27 100644
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
@@ -10,3 +10,4 @@ SRC_URI += "\
 
 INSANE_SKIP_${PN} = "installed-vs-shipped"
 KERNEL_IMAGETYPE = "zImage"
+B = "${S}"
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend
deleted file mode 100644
index 29b11a3..0000000
--- a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL"
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
index c25739b..c25739b 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
index b6358d7..602c3df 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
@@ -20,12 +20,6 @@
 ##
 #############################################################################
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:"
-SRC_URI += "\
-    file://ARM-perf-add-support-for-perf-registers-API.diff \
-    file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
-    "
-
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
 
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
index d6e1e21..928fb8c 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -1,68 +1,26 @@
-From ecd64c7926b7aa25b028278666abad582e7cdea8 Mon Sep 17 00:00:00 2001
+From 15ba0d8f9e2ad8f3024734810088e4caddaaec5a Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
 Date: Fri, 9 May 2014 10:23:50 +0300
 Subject: [PATCH] Updated kernel arguments for sabre sd
 
-- detect if hdmi is used and change video arguments accordingly
 - disable blanking and cursor blinking
 ---
- include/configs/mx6sabre_common.h | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
+ include/configs/mx6sabre_common.h | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index c81e9e9..9296b9b 100644
+index a8746a4..251b28b 100644
 --- a/include/configs/mx6sabre_common.h
 +++ b/include/configs/mx6sabre_common.h
-@@ -87,6 +87,13 @@
- /* Command definition */
- #include <config_cmd_default.h>
- 
-+/* I2C Configs */
-+#define CONFIG_CMD_I2C
-+#define CONFIG_SYS_I2C
-+#define CONFIG_SYS_I2C_MXC
-+#define CONFIG_SYS_I2C_SPEED           100000
-+#define CONFIG_I2C_EDID
-+
- #define CONFIG_CMD_BMODE
- #define CONFIG_CMD_BOOTZ
- #define CONFIG_CMD_SETEXPR
-@@ -119,6 +126,15 @@
- #define EMMC_ENV ""
- #endif
- 
-+#define VIDEOARGS \
-+       "videoargs=" \
-+       "i2c dev 1 ; " \
-+       "if i2c probe 0x50 ; then " \
-+               "setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
-+       "else " \
-+               "setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
-+       "fi\0"
-+
- #define CONFIG_EXTRA_ENV_SETTINGS \
-        "script=boot.scr\0" \
-        "image=zImage\0" \
-@@ -146,7 +162,11 @@
-                        "fi; "  \
-                "fi\0" \
-        EMMC_ENV          \
-+       VIDEOARGS \
+@@ -171,6 +171,8 @@
+                "done\0" \
         "mmcargs=setenv bootargs console=${console},${baudrate} " \
-+               "video=${video} "\
+                "root=${mmcroot} " \
 +               "consoleblank=0 " \
 +               "vt.global_cursor_default=0 " \
-                "root=${mmcroot}\0" \
+                VIDEO_ARGS "\0" \
         "loadbootscript=" \
                 "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-@@ -155,6 +175,7 @@
-        "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-        "mmcboot=echo Booting from mmc ...; " \
-+               "run videoargs; " \
-                "run mmcargs; " \
-                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                        "if run loadfdt; then " \
 -- 
 1.9.1
 
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
index a1a3b27..a1a3b27 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
index f739245..3f07de3 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
@@ -34,3 +34,5 @@ config_script () {
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
     echo "CONFIG_USB_ACM=m"         >> ${S}/.config
 }
+
+B = "${S}"
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index 658e068..8865a69 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -32,6 +32,7 @@ PACKAGECONFIG += " \
     linuxfb \
     sql-sqlite \
     tslib \
+    libinput \
     "
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
diff --git a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
index 01775eb..9aa9648 100644
--- a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
+++ b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
@@ -1,4 +1,4 @@
-From 6b833a7767c25b60fb0bb8dcc00484df19946288 Mon Sep 17 00:00:00 2001
+From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Wed, 9 Sep 2015 13:37:28 +0300
 Subject: [PATCH] Support SYSROOT in c_rehash
@@ -10,39 +10,27 @@ environment variable and use it to locate the actual files during image
 creation.
 
 Upstream-status: Pending
-
 ---
- tools/c_rehash.in | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
+ tools/c_rehash.in | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
 
 diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index f8d0ce1..e81ec5b 100644
+index 92cb503..f3d2703 100644
 --- a/tools/c_rehash.in
 +++ b/tools/c_rehash.in
-@@ -5,6 +5,7 @@
- # and add symbolic links to their hash values.
- 
- my $openssl;
-+my $sysroot;
- 
- my $dir;
+@@ -7,6 +7,7 @@ my $dir;
  my $prefix;
-@@ -16,6 +17,10 @@ if(defined $ENV{OPENSSL}) {
-        $ENV{OPENSSL} = $openssl;
- }
  
-+if(defined $ENV{SYSROOT}) {
-+       $sysroot = $ENV{SYSROOT};
-+}
-+
+ my $openssl = $ENV{OPENSSL} || "openssl";
++my $sysroot = $ENV{SYSROOT} || "";
  my $pwd;
- eval "require Cwd";
- if (defined(&Cwd::getcwd)) {
-@@ -76,15 +81,16 @@ sub hash_dir {
+ my $verbose = 0;
+ my $symlink_exists=eval {symlink("",""); 1};
+@@ -101,16 +102,17 @@ sub hash_dir {
+                }
         }
-        closedir DIR;
-        FILE: foreach $fname (grep {/\.pem$/} @flist) {
-+       $fullname = $sysroot . readlink($fname);
+        FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
++               $fullname = $sysroot . readlink($fname);
                 # Check to see if certificates and/or CRLs present.
 -               my ($cert, $crl) = check_file($fname);
 +               my ($cert, $crl) = check_file($fullname);
@@ -53,27 +41,29 @@ index f8d0ce1..e81ec5b 100644
 -               link_hash_cert($fname) if($cert);
 -               link_hash_cert_old($fname) if($cert);
 -               link_hash_crl($fname) if($crl);
+-               link_hash_crl_old($fname) if($crl);
 +               link_hash_cert($fname, $fullname) if($cert);
 +               link_hash_cert_old($fname, $fullname) if($cert);
 +               link_hash_crl($fname, $fullname) if($crl);
++               link_hash_crl_old($fname, $fullname) if($crl);
         }
  }
  
-@@ -117,9 +123,10 @@ sub check_file {
+@@ -143,9 +145,10 @@ sub check_file {
  
  sub link_hash_cert {
                 my $fname = $_[0];
--               my $hashopt = $_[1] || '-subject_hash';
+-               my $x509hash = $_[1] || '-subject_hash';
 -               $fname =~ s/'/'\\''/g;
--               my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`;
+-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
 +               my $fullname = $_[1];
-+               my $hashopt = $_[2] || '-subject_hash';
++               my $x509hash = $_[2] || '-subject_hash';
 +               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fullname"`;
++               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`;
                 chomp $hash;
                 chomp $fprint;
                 $fprint =~ s/^.*=//;
-@@ -150,15 +157,16 @@ sub link_hash_cert {
+@@ -176,11 +179,11 @@ sub link_hash_cert {
  }
  
  sub link_hash_cert_old {
@@ -81,15 +71,23 @@ index f8d0ce1..e81ec5b 100644
 +               link_hash_cert($_[0], $_[1], '-subject_hash_old');
  }
  
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
+ sub link_hash_crl_old {
+-               link_hash_crl($_[0], '-hash_old');
++               link_hash_crl($_[0], $_[1], '-hash_old');
+ }
+ 
+ 
+@@ -188,9 +191,10 @@ sub link_hash_crl_old {
  
  sub link_hash_crl {
                 my $fname = $_[0];
+-               my $crlhash = $_[1] || "-hash";
 -               $fname =~ s/'/'\\''/g;
--               my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`;
+-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
 +               my $fullname = $_[1];
++               my $crlhash = $_[2] || "-hash";
 +               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fullname'`;
++               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`;
                 chomp $hash;
                 chomp $fprint;
                 $fprint =~ s/^.*=//;
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index ca71c1c..1be3fc0 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -12,21 +12,21 @@
 
   <project name="poky"
            remote="yocto"
-           revision="9c4ff467f66428488b1cd9798066a8cb5d6b4c3b"
+           revision="08d32590411568e7bf11612ac695a6e9c6df6286"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe"
-           revision="5b6f39ce325d490fc382d5d59c5b8b9d5fa38b38"
+           revision="10d3c8f85280a0bf867a8e4f84bcda81c290d28e"
            path="sources/meta-openembedded"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="db1571f40c375a398a8cdbb42de4c4f272ab0cd1"
+           revision="44a5115b6ece869cfb10714423e6956128dbaef8"
            path="sources/meta-fsl-arm"
            groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="6d1c337af7d43953f6d0802ffd0bf1d9d3cfb146"
+           revision="477f7b7f03dd7c803803101240a416e88cf49fcc"
            path="sources/meta-ti"
            groups="notdefault,ti,bbb"/>
   <project name="meta-raspberrypi"
@@ -36,7 +36,7 @@
            groups="notdefault,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="794e46e0b0a3e7e270a2f3c217d8fe5751a6b2c6"
+           revision="436b86e3421736216412bdbb21cd9cb08c758c75"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-beagleboard"
diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_fido.xml
index 4b2e4ff..ac62242 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_fido.xml
@@ -12,21 +12,21 @@
 
   <project name="poky"
            remote="yocto"
-           revision="dizzy"
+           revision="fido"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe"
-           revision="dizzy"
+           revision="fido"
            path="sources/meta-openembedded"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="dizzy"
+           revision="fido"
            path="sources/meta-fsl-arm"
            groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="master"
+           revision="fido"
            path="sources/meta-ti"
            groups="notdefault,ti,bbb"/>
   <project name="meta-raspberrypi"
@@ -36,7 +36,7 @@
            groups="notdefault,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="dizzy"
+           revision="fido"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-beagleboard"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index f3124ee..a33281b 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -24,7 +24,7 @@
 set -x
 set -e
 
-RELEASE=5.5
+RELEASE=5.6
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
 if [ ${MACHINE} = "emulator" ]; then