From 2d926de7f7ccb9f5cb22fb22360207780f920752 Mon Sep 17 00:00:00 2001
From: Tuomas Heimonen <tuomas.heimonen@theqtcompany.com>
Date: Mon, 4 Apr 2016 12:36:15 +0300
Subject: Add Support for Raspberry Pi 3

Change-Id: I1220cce68059328512e52b7f5a9af7110dd9578c
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
---
 b2qt-init-build-env                   |  2 +-
 conf/distro/include/raspberrypi3.conf | 57 +++++++++++++++++++++++++++++++++++
 scripts/manifest.xml                  |  2 +-
 scripts/setup-environment.sh          |  2 +-
 4 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 conf/distro/include/raspberrypi3.conf

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 10a20c9..6d2edcf 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -110,7 +110,7 @@ get_groups() {
     beaglebone)
       PROJECT_GROUPS="bbb"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       PROJECT_GROUPS="rpi"
     ;;
     nuc)
diff --git a/conf/distro/include/raspberrypi3.conf b/conf/distro/include/raspberrypi3.conf
new file mode 100644
index 0000000..ee9a9e0
--- /dev/null
+++ b/conf/distro/include/raspberrypi3.conf
@@ -0,0 +1,57 @@
+##############################################################################
+##
+## 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 = "Raspberry Pi 3"
+
+IMAGE_FSTYPES += "ext3 rpi-sdimg"
+
+BOOTFS_CONTENT = "\
+    bcm2835-bootfiles/*: \
+    ${KERNEL_IMAGETYPE}:kernel.img \
+    "
+BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
+
+MACHINE_EXTRA_INSTALL = "\
+        userland \
+        omxplayer \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        userland \
+        "
+
+KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
+KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
+module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
+
+# additional memory for GPU
+GPU_MEM = "256"
+# video camera support
+VIDEO_CAMERA = "1"
+RPI_FT5604 = "1"
+
+KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
+MACHINE_FEATURES += "pitft"
+
+# MACHINEOVERRIDES = "raspberrypi2:${MACHINE}"
+
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-brcm43430"
+
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 5ba0e81..9d1cf6b 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -45,7 +45,7 @@
            groups="notdefault,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="a42a1706de91ed03ae8798c7f9e70c30cebcf7de"
+           revision="e82417d33b8147f65141ef937d56735d80ee7207"
            path="sources/meta-raspberrypi"
            groups="notdefault,rpi"/>
   <project name="meta-fsl-arm-extra"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index b25a4cc..c3b229c 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -66,7 +66,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     beaglebone)
       LAYERSCONF="bblayers.conf.bbb.sample"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
     nuc)
-- 
cgit v1.2.3-54-g00ecf