Raspberry Pi conf split

Change-Id: I556a0b35ff21edc6bec1897dd1c769012058df6b
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

4 files changed, 56 insertions, 81 deletions

diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index a9e4b20..5f80c38 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -19,33 +19,11 @@
 ##
 ##############################################################################
 
-DEPLOY_CONF_NAME = "Raspberry Pi"
-
-IMAGE_FSTYPES += "ext3 rpi-sdimg"
+include conf/distro/include/raspberrypi.inc
 
-BOOTFS_CONTENT = "\
-    bcm2835-bootfiles/*: \
-    ${KERNEL_IMAGETYPE}:kernel.img \
-    "
-BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
-
-PREFERRED_PROVIDER_virtual/libgles1 = "userland"
+DEPLOY_CONF_NAME = "Raspberry Pi"
 
 DISTRO_FEATURES_remove = "webengine"
 
-MACHINE_EXTRA_INSTALL = "\
-        userland \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK = " \
-        userland-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 = "128"
-# video camera support
-VIDEO_CAMERA = "1"
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
new file mode 100644
index 0000000..49d152e
--- /dev/null
+++ b/conf/distro/include/raspberrypi.inc
@@ -0,0 +1,50 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+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_SDK = " \
+        userland-dev \
+        "
+
+MACHINE_EXTRA_INSTALL = "\
+        userland \
+        omxplayer \
+        "
+
+KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
+KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
+module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
+
+# video camera support
+VIDEO_CAMERA = "1"
+
+RPI_FT5604 = "1"
+KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
+MACHINE_FEATURES += "pitft"
+
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 040ea9b..e90eeae 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -19,34 +19,10 @@
 ##
 ##############################################################################
 
-DEPLOY_CONF_NAME = "Raspberry Pi 2"
-
-IMAGE_FSTYPES += "ext3 rpi-sdimg"
-
-BOOTFS_CONTENT = "\
-    bcm2835-bootfiles/*: \
-    ${KERNEL_IMAGETYPE}:kernel.img \
-    "
-BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
+include conf/distro/include/raspberrypi.inc
 
-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"
+DEPLOY_CONF_NAME = "Raspberry Pi 2"
 
 # 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"
diff --git a/conf/distro/include/raspberrypi3.conf b/conf/distro/include/raspberrypi3.conf
index ee9a9e0..aa76ac5 100644
--- a/conf/distro/include/raspberrypi3.conf
+++ b/conf/distro/include/raspberrypi3.conf
@@ -19,39 +19,10 @@
 ##
 ##############################################################################
 
-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 \
-        "
+include conf/distro/include/raspberrypi.inc
 
-KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
-KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
-module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
+DEPLOY_CONF_NAME = "Raspberry Pi 3"
 
 # 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"