Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:

  tegra: correctly append to DEPENDS
  poky: update to latest revision in morty branch
  meta-qt5: update layer
  otf-noto: get files from the git repo
  Add qdbd to automotive images
  apalis-imx6: lower default resolution on HDMI to 720p
  Fix for the broken gdb in windows toolchain

Conflicts:
  recipes/gdb/gdb-cross-canadian_7.%.bbappend
  scripts/manifest.xml

Change-Id: Ia02e9bea46758459e2792cd10174f3c38f4f7a10

2 files changed, 23 insertions, 0 deletions

diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
new file mode 100644
index 0000000..c259f7f
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
@@ -0,0 +1,22 @@
+From 0b31b8e73bfbc02e7687ea521e9e92f892e7052a Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 18 Oct 2017 13:20:25 +0300
+Subject: [PATCH 4/4] apalis-imx6: lower default resolution on HDMI to 720p
+
+---
+ include/configs/apalis_imx6.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
+index 77a8874..0292e74 100644
+--- a/include/configs/apalis_imx6.h
++++ b/include/configs/apalis_imx6.h
+@@ -295,7 +295,7 @@
+                "source ${loadaddr}\0" \
+        "splashpos=m,m\0" \
+        "vidargs=mxc_hdmi.only_cea=1 " \
+-               "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
++               "video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \
+                "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
+                "fbmem=32M\0 "
+ 
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend
index 3d288f1..bfa84e3 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend
@@ -32,5 +32,6 @@ SRC_URI += " \
         file://0001-Make-sdboot-default-on-all-boards.patch \
         file://0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch \
         file://0003-apalis-imx6-Ixora-v1.0-support.patch \
+        file://0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch \
         "
 DEPENDS += "dtc-native"