3 files changed, 49 insertions, 2 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 686fdcf..cb40b6b 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -100,7 +100,7 @@ get_groups() {
     beaglebone)
       PROJECT_GROUPS="bbb"
     ;;
-    raspberrypi)
+    raspberrypi|raspberrypi2)
       PROJECT_GROUPS="rpi"
     ;;
     emulator)
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
new file mode 100644
index 0000000..23b457a
--- /dev/null
+++ b/conf/distro/include/raspberrypi2.conf
@@ -0,0 +1,47 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+BOOTFS_CONTENT = "\
+    bcm2835-bootfiles/*: \
+    ${KERNEL_IMAGETYPE}:kernel.img \
+    "
+BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
+
+PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics-hardfp"
+
+MACHINE_EXTRA_INSTALL = "\
+        vc-graphics-hardfp \
+        omxplayer \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        vc-graphics-hardfp-dev \
+        "
+
+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"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index ad1405b..3439d90 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -64,7 +64,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     beaglebone)
       LAYERSCONF="bblayers.conf.bbb.sample"
     ;;
-    raspberrypi)
+    raspberrypi|raspberrypi2)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
     emulator)