sabresd: rename config file

Upstream has combined imx6q and imx6dl machine configs to one.

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

4 files changed, 8 insertions, 46 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 5aa39f1..9858948 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -115,7 +115,7 @@ get_groups() {
     nitrogen6x|nitrogen7)
       PROJECT_GROUPS="boundary"
     ;;
-    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
+    imx6qdlsabresd|imx7dsabresd|imx7s-warp)
       PROJECT_GROUPS="fsl"
     ;;
     smarc-samx6i)
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
index af49983..5f3ddb3 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
@@ -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.
@@ -27,6 +27,9 @@
 ##
 ############################################################################
 
-require imx6qsabresd.conf
+include conf/distro/include/fsl.inc
+include conf/distro/include/opencv.inc
 
-DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Dual"
+DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device"
+
+KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
deleted file mode 100644
index 683c601..0000000
--- a/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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
-include conf/distro/include/opencv.inc
-
-DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
-
-KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
-
-# add support for both imx6qsabresd and imx6dlsabresd
-KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
-                     imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
-                    "
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 44f529c..077f3af 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -65,7 +65,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     nitrogen6x|nitrogen7)
       LAYERSCONF="bblayers.conf.boundary.sample"
     ;;
-    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
+    imx6qdlsabresd|imx7dsabresd|imx7s-warp)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)