Merge remote-tracking branch 'origin/dizzy' into dev

* origin/dizzy:
  Add atk and atk-dev packages
  ca-certificates: update to latest version
  Add touch_frame events to Weston 1.5.0
  kontron: Add support for Kontron SMARC-sARX6i
  bootfs: make sure deploy dir exists before using it

Change-Id: I5c58c6ad47c0689c15e71948a486530f5504b329

1 files changed, 46 insertions, 0 deletions

diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
new file mode 100644
index 0000000..8e69ac8
--- /dev/null
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -0,0 +1,46 @@
+#############################################################################
+##
+## Copyright (C) 2014 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$
+##
+#############################################################################
+
+include conf/distro/include/imx6.inc
+
+KERNEL_IMAGETYPE = "uImage"
+
+BOOTFS_CONTENT = " "
+
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
+        kernel-devicetree \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+
+KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"