poky: update to 2.5 branch (sumo)

Update yocto from 2.3.4 (pyro) to 2.5.1 (sumo):

- Update poky, meta-openembedded & meta-mingw to sumo branch
- update image classes (obsolete IMAGE_DEPENDS definitions)
- Update bbappends under meta-boot2qt-distro
- Update meta-*-extras layers bbappends & patches

All recipes related to nitrogen6x are fixed here, but this depends
on follow up commits to work correctly.

Task-number: QTBUG-68681
Change-Id: Ic5802c5c1a3989bed746f96f8cf173743ec755bb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

9 files changed, 74 insertions, 41 deletions

diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
index da4b2c1..9bf3498 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
@@ -33,7 +33,7 @@ SRC_URI += " \
         "
 
 # kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 
 do_preconfigure_prepend() {
     echo "CONFIG_HID_MULTITOUCH=m"              >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
index 74fa4ab..a668575 100644
--- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
@@ -28,7 +28,7 @@
 ############################################################################
 
 # kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 
 do_preconfigure_prepend() {
     # FunctionFS for qdbd
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
index 47fd1bf..eb5364d 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
@@ -28,7 +28,7 @@
 ############################################################################
 
 # kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 
 do_preconfigure_prepend() {
     # FunctionFS for qdbd
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
index 0343f06..123782e 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
@@ -1,23 +1,23 @@
-From 554d219b3485402c6992abc0aa32c74e8f251876 Mon Sep 17 00:00:00 2001
+From 07234c1c0f991a560010672a619740e385778f90 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Thu, 11 Feb 2016 10:17:51 +0200
 Subject: [PATCH] Add support for KOE tx31d200vm0baa display
 
 Used for the cluster demo
 ---
- arch/arm/include/asm/imx-common/fbpanel.h    | 27 +++++++++++++++++++++++++++
+ arch/arm/include/asm/imx-common/fbpanel.h    | 27 ++++++++++++++++++++
  board/boundary/nitrogen6_max/nitrogen6_max.c |  1 +
  board/boundary/nitrogen6sx/nitrogen6sx.c     |  1 +
  board/boundary/nitrogen6x/nitrogen6x.c       |  1 +
  4 files changed, 30 insertions(+)
 
 diff --git a/arch/arm/include/asm/imx-common/fbpanel.h b/arch/arm/include/asm/imx-common/fbpanel.h
-index b6f7af4..b8acdae 100644
+index f5465c3c80..643cd86e29 100644
 --- a/arch/arm/include/asm/imx-common/fbpanel.h
 +++ b/arch/arm/include/asm/imx-common/fbpanel.h
-@@ -39,6 +39,33 @@ void fbp_enable_fb(struct display_info_t const *di, int enable);
- int fbp_detect_i2c(struct display_info_t const *di);
- void fbp_setup_display(const struct display_info_t *displays, int cnt);
+@@ -116,6 +116,33 @@ void fbp_setup_display(const struct display_info_t *displays, int cnt);
+        .fbtype = FB_##_mode,\
+        .fbflags = _flags
  
 +/* tx31d200vm0baa == koe */
 +#define IMX_VD_KOE(_mode, _detect, _bus) \
@@ -47,44 +47,41 @@ index b6f7af4..b8acdae 100644
 +}
 +
  /* hdmi settings */
- #define IMX_VD50_1280_720M_60(_mode, _detect, _bus) \
+ #define VDF_1280_720M_60(_mode, _name, _fmt, _flags, _detect, _bus, _addr) \
  {\
 diff --git a/board/boundary/nitrogen6_max/nitrogen6_max.c b/board/boundary/nitrogen6_max/nitrogen6_max.c
-index 337e9b5..ba29aee 100644
+index 1c4106e735..51bc0bd8f3 100644
 --- a/board/boundary/nitrogen6_max/nitrogen6_max.c
 +++ b/board/boundary/nitrogen6_max/nitrogen6_max.c
-@@ -568,6 +568,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
+@@ -497,6 +497,7 @@ int fbp_detect_serializer(struct display_info_t const *di)
  }
  
  static const struct display_info_t displays[] = {
 +       IMX_VD_KOE(LVDS, 0, 2),
         /* hdmi */
-        IMX_VD50_1280_720M_60(HDMI, 1, 1),
-        IMX_VD50_1920_1080M_60(HDMI, 0, 1),
+        VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
+        VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
 diff --git a/board/boundary/nitrogen6sx/nitrogen6sx.c b/board/boundary/nitrogen6sx/nitrogen6sx.c
-index cdabcd8..de6582e 100644
+index dc05042add..3725d63cf3 100644
 --- a/board/boundary/nitrogen6sx/nitrogen6sx.c
 +++ b/board/boundary/nitrogen6sx/nitrogen6sx.c
-@@ -685,6 +685,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
- 
+@@ -436,6 +436,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
+ }
  
  static const struct display_info_t displays[] = {
 +       IMX_VD_KOE(LVDS, 0, 2),
-        /* hdmi/lcd */
-        _IMX_VD_1280_720M_60(LCD, 1, 2, 50, 0),
-        _IMX_VD_1920_1080M_60(LCD, 0, 2, 50, 0),
+        /* hdmi/lcd via tfp410 */
+        VDF_1280_720M_60(LCD, "1280x720M@60", RGB24, 0, fbp_detect_i2c, 2, 0x50),
+        VDF_1920_1080M_60(LCD, "1920x1080M@60", RGB24, 0, NULL, 2, 0x50),
 diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
-index 21d6cd7..b24f2f6 100644
+index d9f6a829f1..80b102e206 100644
 --- a/board/boundary/nitrogen6x/nitrogen6x.c
 +++ b/board/boundary/nitrogen6x/nitrogen6x.c
-@@ -525,6 +525,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
+@@ -359,6 +359,7 @@ void board_pre_enable(const struct display_info_t *di)
  }
  
  static const struct display_info_t displays[] = {
 +       IMX_VD_KOE(LVDS, 0, 2),
         /* hdmi */
-        IMX_VD50_1280_720M_60(HDMI, 1, 1),
-        IMX_VD50_1920_1080M_60(HDMI, 0, 1),
--- 
-1.9.1
-
+        VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
+        VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
index 9eda199..b0791e9 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
@@ -1,4 +1,4 @@
-From 59d272d9df5337bb4bd62a96fc16c8e280c49344 Mon Sep 17 00:00:00 2001
+From fa2e83db63fe5abdfa00d205301d12e1a271a291 Mon Sep 17 00:00:00 2001
 From: Mikko Gronoff <mikko.gronoff@qt.io>
 Date: Sun, 23 Apr 2017 21:47:01 +0300
 Subject: [PATCH] set CMA reserved size to 384MB
@@ -10,12 +10,12 @@ video decoding cannot work for high resolution videos.
  1 file changed, 1 insertion(+)
 
 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
-index 646c505..ddbb4c5 100644
+index bd4e54cb67..48114d5739 100644
 --- a/include/configs/nitrogen6x.h
 +++ b/include/configs/nitrogen6x.h
-@@ -28,6 +28,7 @@
+@@ -33,6 +33,7 @@
  #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
- #define CONFIG_VIDEO
+ 
  #define BD_I2C_MASK    7
 +#define BD_CMA         "384M"
  
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
new file mode 100644
index 0000000..c5fa923
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
@@ -0,0 +1,36 @@
+From 22c5a278b98cf6ea4e4a402bca19d1354ab3c431 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 25 Sep 2018 16:05:17 +0300
+Subject: [PATCH] Disable build for tools and use mkimage from sysroot
+
+fails when trying to compile with host gcc: unable to execute
+'x86_64-linux-gnu-gcc': No such file or directory
+---
+ Makefile             | 2 +-
+ scripts/Makefile.lib | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 119ad49eec..022690e26e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -698,7 +698,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
+ 
+ libs-y := $(sort $(libs-y))
+ 
+-u-boot-dirs    := $(patsubst %/,%,$(filter %/, $(libs-y))) tools examples
++u-boot-dirs    := $(patsubst %/,%,$(filter %/, $(libs-y)))
+ 
+ u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-))))
+ 
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 80ddb08474..e86c949f08 100644
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -493,5 +493,5 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
+ # ---------------------------------------------------------------------------
+ MKIMAGEOUTPUT ?= /dev/null
+ quiet_cmd_mkimage = MKIMAGE $@
+-cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
++cmd_mkimage = mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+        $(if $(KBUILD_VERBOSE:1=), >$(MKIMAGEOUTPUT))
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_%.bbappend
index 013e54b..3b5235f 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -31,4 +31,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-Add-support-for-KOE-tx31d200vm0baa-display.patch \
         file://0002-set-CMA-reserved-size-to-384MB.patch \
+        file://0003-Disable-build-for-tools.patch \
         "
+
+DEPENDS += "u-boot-mkimage-native"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
index 7d8e8ec..02a1e33 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
@@ -1,4 +1,4 @@
-From 3fdf74d6934858d04d9e7df7cd24779bf7d9fdbb Mon Sep 17 00:00:00 2001
+From 3c3c3284727076f4ae751bfc9cadb222423c9a4b Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Wed, 13 Jan 2016 08:55:41 +0200
 Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display
@@ -8,12 +8,12 @@ Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display
  1 file changed, 6 insertions(+)
 
 diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-index 7c11f4c..86242b5 100644
+index f6bf2f5..427d837 100644
 --- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
 +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-@@ -105,6 +105,12 @@ else
-        setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bpart}"
- fi
+@@ -130,6 +130,12 @@ if itest.s "x" != "x${disable_msi}" ; then
+        setenv bootargs ${bootargs} pci=nomsi
+ fi;
  
 +if test "hannstar" = "${fb_lvds}" || test "hannstar" = "${fb_lvds2}"  ; then
 +    setenv bootargs ${bootargs} ft5x06_ts.screenres=1024,600
@@ -24,6 +24,3 @@ index 7c11f4c..86242b5 100644
  if itest.s "x" != "x${disable_giga}" ; then
         setenv bootargs ${bootargs} fec.disable_giga=1
  fi
--- 
-1.9.1
-
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_%.bbappend
index dafcf84..e4b3730 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.