18 files changed, 212 insertions, 10 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index ef2e024..10a20c9 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -119,6 +119,9 @@ get_groups() {
     nvidia-logan)
       PROJECT_GROUPS="nvidia-logan"
     ;;
+    tegra-x1|tegra-t18x)
+      PROJECT_GROUPS="nvidia-tegra"
+    ;;
     emulator)
       PROJECT_GROUPS="emulator"
     ;;
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index 0c8fb99..47ddcf8 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -37,7 +37,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
new file mode 100644
index 0000000..f0dfbb7
--- /dev/null
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -0,0 +1,49 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-vib4 \
+  ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  "
+
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
new file mode 100644
index 0000000..12b57d4
--- /dev/null
+++ b/conf/distro/include/tegra-t18x.conf
@@ -0,0 +1,67 @@
+#############################################################################
+##
+## Copyright (C) 2016 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
+DISTRO_FEATURES_DEFAULT += "wayland weston"
+
+MACHINE_EXTRA_INSTALL = "\
+tegra-firmware-fecs \
+tegra-firmware-gmicrocode \
+tegra-firmware-gpccs \
+tegra-firmware-gpmu \
+tegra-firmware-gshader \
+tegra-firmware-pmu \
+tegra-firmware-prod-fuse \
+tegra-firmware-xusb \
+tegra-firmware-vic \
+tegra-firmware-nvdec \
+tegra-firmware-nvenc \
+tegra-firmware-nvjpeg \
+tegra-drivers \
+virtual/libegl \
+virtual/libgles2 \
+libdrm-nv \
+asound-conf \
+"
+
+PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libgles2-dev ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libegl ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libegl-dev ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/egl ?= "tegra-drivers"
+
+PREFERRED_PROVIDER_wayland ?= "wayland-nv"
+PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
+PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
+
+BBMASK ?= " "
+BBMASK .= "\
+|meta-vib4/recipes-connectivity/connman\
+|meta-vib4/recipes-core/busybox\
+|meta-vib4/recipes-core/images\
+|meta-vib4/recipes-core/meta\
+|meta-vib4/recipes-core/packagegroups\
+|meta-vib4/recipes-core/systemd/systemd\
+|meta-vib4/recipes-devtools\
+|meta-vib4/recipes-extended\
+|meta-vib4/recipes-multimedia/audiomanager\
+"
diff --git a/meta-nvidia-logan-extras/conf/layer.conf b/meta-nvidia-extras/conf/layer.conf
index da03f5e..aa447a5 100644
--- a/meta-nvidia-logan-extras/conf/layer.conf
+++ b/meta-nvidia-extras/conf/layer.conf
@@ -27,6 +27,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
             ${LAYERDIR}/recipes*/*/*.bbappend \
 "
 
-BBFILE_COLLECTIONS += "b2qt_nvidia-logan"
-BBFILE_PATTERN_b2qt_nvidia-logan := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_nvidia-logan = "20"
+BBFILE_COLLECTIONS += "b2qt_nvidia"
+BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_nvidia = "20"
diff --git a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
index 86f0571..86f0571 100644
--- a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
diff --git a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf b/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
index a1e45b9..a1e45b9 100644
--- a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
new file mode 100644
index 0000000..f9d9cc6
--- /dev/null
+++ b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
@@ -0,0 +1,28 @@
+do_kernel_defconfig_prepend_tegra-t18x () {
+}
+
+do_install_append_tegra-t18x () {
+    s=$(readlink -m "${S}")
+    kernsrc="${STAGING_KERNEL_DIR}"
+
+    if [ "${s}" != "${kernsrc}" ]; then
+        mkdir -p "${kernsrc}"
+        rm -rf "${kernsrc}"
+        mv "${S}" "${STAGING_KERNEL_DIR}"
+        ln -sf "${kernsrc}" "${s}"
+    fi
+}
+
+do_compile_prepend_tegra-t18x () {
+    if [ -z "${TOOLCHAIN_PATH}" ] ; then
+        echo "TOOLCHAIN_PATH must be set"
+        exit -1
+    fi
+
+    export PATH="${TOOLCHAIN_PATH}/usr/bin/aarch64-gnu-linux:${PATH}"
+
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
+    echo "CONFIG_USB_ACM=m"         >> ${B}/.config
+
+    make olddefconfig
+}
diff --git a/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend b/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend
new file mode 100644
index 0000000..1800e5e
--- /dev/null
+++ b/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend
@@ -0,0 +1,4 @@
+RDEPENDS_${PN}_remove_tegra-t18x = "\
+libgbm-dev \
+"
+
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
index c33ee23..cd74ddf 100644
--- a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
@@ -19,5 +19,5 @@
 ##
 ##############################################################################
 
-DEPENDS += "graphics-headers"
-PACKAGECONFIG += "kms"
+DEPENDS_nvidia-logan += "graphics-headers"
+PACKAGECONFIG_nvidia-logan += "kms"
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
index 7f9ce03..97acf20 100644
--- a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
@@ -20,4 +20,4 @@
 ##############################################################################
 
 CXXFLAGS +=" -DWIN_INTERFACE_CUSTOM"
-
+COMPATIBLE_MACHINE_aarch64 = "(.*)"
diff --git a/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
new file mode 100644
index 0000000..629ccf4
--- /dev/null
+++ b/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 97a29d6..b0e4060 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -208,10 +208,6 @@ AS_CASE([$CC], [*clang*],
+                -Wno-gnu-variable-sized-type-not-at-end \
+         ])])
+ 
+-AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
+-        [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
+-               -flto -ffat-lto-objects])],
+-        [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
+ AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
+ 
+ AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
+-- 
+2.5.0
+
diff --git a/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..d86ee9d
--- /dev/null
+++ b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_tegra-t18x := "${THISDIR}/${PN}:"
diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
new file mode 100644
index 0000000..85a2996
--- /dev/null
+++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
@@ -0,0 +1,12 @@
+GRAPHICS_PACKAGES = " \
+virtual/libgles2 \
+virtual/libegl \
+virtual/egl \
+libgbm \
+libgbm-dev \
+"
+
+PROVIDES_append = " ${GRAPHICS_PACKAGES}"
+RPROVIDES_append_${PN} = " ${GRAPHICS_PACKAGES}"
+CONFLICTS_append_${PN} = " ${GRAPHICS_PACKAGES}"
+REPLACES_append_${PN} = " ${GRAPHICS_PACKAGES}"
diff --git a/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend
new file mode 100644
index 0000000..db0da64
--- /dev/null
+++ b/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend
@@ -0,0 +1,9 @@
+EXTRA_PROVIDES = " \
+virtual/wayland-native \
+wayland-native \
+"
+
+PROVIDES_append = "${EXTRA_PROVIDES}"
+RPROVIDES_append_${PN} = "${EXTRA_PROVIDES}"
+CONFLICTS_append_${PN} = "${EXTRA_PROVIDES}"
+REPLACES_append_${PN} = "${EXTRA_PROVIDES}"
diff --git a/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri b/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
new file mode 100644
index 0000000..4597a84
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
@@ -0,0 +1,11 @@
+TEGRA_T18X_CFLAGS       = -DWIN_INTERFACE_CUSTOM
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
+QMAKE_CFLAGS           += $$TEGRA_T18X_CFLAGS
+QMAKE_CXXFLAGS         += $$TEGRA_T18X_CFLAGS
+
+QMAKE_PLATFORM         += boot2qt
+
+QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
+
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 28adeec..b25a4cc 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -72,8 +72,8 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     nuc)
       LAYERSCONF="bblayers.conf.nuc.sample"
     ;;
-    nvidia-logan)
-      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
+    nvidia-logan|tegra-x1|tegra-t18x)
+      LAYERSCONF="bblayers.conf.nvidia.sample"
     ;;
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index e0d896a..60e7e14 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -33,7 +33,7 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf
-elif [ ${MACHINE} == "nvidia-logan" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
+elif [ ${MACHINE} == "nvidia-logan" || ${MACHINE} == "tegra-x1" || ${MACHINE} == "tegra-t18x" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \
     $PWD/tmp/deploy/images/${MACHINE}/zImage