From 5800a3bfe48a2092ac3b8cf250f04840a6397f3f Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@theqtcompany.com>
Date: Fri, 22 Apr 2016 11:33:41 +0200
Subject: Add support for NXP SABRE iMX7D

Change-Id: Ifef4dc7a1aad2829f2c6978d02efc3b0a7f8720a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 b2qt-init-build-env                                |  2 +-
 conf/distro/include/imx7dsabresd.conf              | 50 ++++++++++++++++++++++
 .../b2qt-appcontroller/mx7/appcontroller.conf      |  8 ++++
 scripts/setup-environment.sh                       |  2 +-
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 conf/distro/include/imx7dsabresd.conf
 create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index b395e5d..7db1c56 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -101,7 +101,7 @@ get_groups() {
     apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       PROJECT_GROUPS="fsl"
     ;;
     smarc-samx6i)
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf
new file mode 100644
index 0000000..6dbaef0
--- /dev/null
+++ b/conf/distro/include/imx7dsabresd.conf
@@ -0,0 +1,50 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual"
+
+IMAGE_FSTYPES += "ext3 sdcard"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb.dtb:imx7d-sdb.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-enet.dtb:imx7d-sdb-enet.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-epdc.dtb:imx7d-sdb-epdc.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-gpmi-weim.dtb:imx7d-sdb-gpmi-weim.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-hdmi-audio.dtb:imx7d-sdb-hdmi-audio.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-m4.dtb:imx7d-sdb-m4.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-qspi.dtb:imx7d-sdb-qspi.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-sim.dtb:imx7d-sdb-sim.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-touch.dtb:imx7d-sdb-touch.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-wm8960.dtb:imx7d-sdb-wm8960.dtb \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
+
+DISTRO_FEATURES_remove = "webengine"
+
+MACHINE_EXTRA_INSTALL = "\
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = "\
+        "
+
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
new file mode 100644
index 0000000..1fe8f14
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
@@ -0,0 +1,8 @@
+env=QMLSCENE_DEVICE=softwarecontext
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_QPA_PLATFORM=linuxfb
+env=QSG_RENDER_LOOP=basic
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
+base=linux
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 322792f..19f7ffa 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -51,7 +51,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx6|colibri-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)
-- 
cgit v1.2.3-54-g00ecf