renesas: update to v3.9.0

Use the latest revision of meta-renesas and add support for the
E3 Ebisu board.

Task-number: QTBUG-68912
Task-number: QTBUG-68985
Change-Id: Ie15a69b606b1726b0404263ef9ac15a58f7258ae
Reviewed-by: Jani Launonen <jani.launonen@qt.io>

3 files changed, 50 insertions, 9 deletions

diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
index 6f502ea..0836f5a 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
@@ -39,7 +39,6 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-poky \
   ${BSPDIR}/sources/meta-renesas/meta-rcar-gen3 \
-  ${BSPDIR}/sources/meta-freescale \
   ${BSPDIR}/sources/meta-linaro/meta-optee \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
diff --git a/meta-boot2qt-distro/conf/distro/include/ebisu.conf b/meta-boot2qt-distro/conf/distro/include/ebisu.conf
new file mode 100644
index 0000000..24bdedd
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/ebisu.conf
@@ -0,0 +1,32 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+include conf/distro/include/rcar-gen3.inc
+
+DEPLOY_CONF_NAME = "Renesas R-Car-E3 Ebisu 4D"
diff --git a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
index 4350dda..6b99603 100644
--- a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
+++ b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 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.
@@ -27,14 +27,28 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl.inc
+IMAGE_FSTYPES += "wic"
+WKS_FILE = "sdimage-bootpart.wks"
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS += "u-boot optee-os"
+
+IMAGE_BOOT_FILES = "\
+    Image \
+    r*.dtb \
+    "
 
 QBSP_IMAGE_CONTENT = "\
     ${IMAGE_LINK_NAME}.img \
     ${IMAGE_LINK_NAME}.conf \
+    bl2-${MACHINE}.srec \
+    bl31-${MACHINE}.srec \
+    tee-${MACHINE}.srec \
+    bootparam_sa0.srec \
+    cert_header_sa6.srec \
+    u-boot-elf-${MACHINE}.srec \
     "
 
-BOOT_SPACE = "16384"
+BOOT_SPACE = "32768"
 
 # uncomment following if using the evaluation drivers
 #DISTRO_FEATURES_append = " use_eva_pkg"
@@ -46,7 +60,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/
 #DISTRO_FEATURES_append = " pam"
 PREFERRED_PROVIDER_virtual/libgles1 = ""
 PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
-PREFERRED_PROVIDER_virtual/egl = "gles-user-module"
+PREFERRED_PROVIDER_virtual/egl = "libegl"
 PREFERRED_PROVIDER_virtual/libgl = ""
 PREFERRED_PROVIDER_virtual/mesa = ""
 PREFERRED_PROVIDER_libgbm = "libgbm"
@@ -59,9 +73,5 @@ FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen3/${PN}:"
 
 BBMASK += "\
     meta-linaro/meta-optee/recipes-security/optee \
-    meta-rcar-gen3/recipes-connectivity/ppp \
     meta-rcar-gen3/recipes-core/packagegroups \
-    meta-rcar-gen3/recipes-graphics/mesa \
-    meta-rcar-gen3/recipes-multimedia/gstreamer \
-    meta-rcar-gen3/recipes-multimedia/webp \
     "