imx8: adapt to sumo

Use WIC to create the image.

Change-Id: I0413f60f96f2f4d3300dc84fdd2baabcc9bb120d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

3 files changed, 81 insertions, 58 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
index d570e3a..7a7728c 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
@@ -27,36 +27,8 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl.inc
+include conf/distro/include/fsl-imx8.inc
 
 DEPLOY_CONF_NAME = "Toradex Apalis iMX8"
 
 SERIAL_CONSOLE = "115200 ttyLP1"
-
-FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
-
-RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
-RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
-
-BBMASK += "\
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa/alsa-lib_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
-    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
-    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
-    meta-freescale/recipes-graphics/wayland/weston \
-    "
-
-KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
-EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
-
-MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
new file mode 100644
index 0000000..4e4256b
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
@@ -0,0 +1,79 @@
+############################################################################
+##
+## 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/fsl.inc
+
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
+
+DISTRO_FEATURES_remove = "vulkan"
+
+RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
+RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
+
+BBMASK += "\
+    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
+    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
+    meta-freescale/recipes-graphics/wayland/weston \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-bsp/imx-test \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/connman \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-devtools/gdb \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-extended/logrotate \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/opencv \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/xorg-driver \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-kernel/cryptodev \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
+    "
+
+KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
+EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
+
+MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
+
+WKS_FILE = "imx8-uboot-bootpart.wks"
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS += "imx-boot"
+
+BOOT_CONFIG_MACHINE_pn-imx-boot = "${BOOT_NAME}-${UBOOT_CONFIG}.bin"
+
+IMAGE_BOOT_FILES = "\
+    Image \
+    fsl-*.dtb \
+    hdmitxfw.bin \
+    "
diff --git a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf b/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
index 6dfaa3a..a3a2c29 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
@@ -27,36 +27,8 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl.inc
+include conf/distro/include/fsl-imx8.inc
 
 DEPLOY_CONF_NAME = "NXP iMX8QM"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-
-FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
-
-RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
-RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
-
-BBMASK += "\
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa/alsa-lib_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
-    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
-    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
-    meta-freescale/recipes-graphics/wayland/weston \
-    "
-
-KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
-EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
-
-MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"