Add Silica ArchiTech tibidabo board

Builds & runs ok!

The current implementation is done with the strategy of using the
vendor's defined repo versions for the yocto stack, instead of the
common versions defined by b2qt. The intention is to build upon the
vendor stack as closely as possible, as that is (hopefully) tested and
maintained.

Task-number: QTEE-801
Change-Id: Ib93b54178de870b5f288b2fae982ea2b4bb74e50
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

11 files changed, 285 insertions, 0 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 1405bf4..8b7dee3 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -88,6 +88,9 @@ get_groups() {
     imx53qsb|imx6qsabresd|nitrogen6x)
       PROJECT_GROUPS="fsl"
     ;;
+    tibidabo)
+      PROJECT_GROUPS="architech"
+    ;;
     beagleboard|am335x-evm)
       PROJECT_GROUPS="ti"
     ;;
@@ -124,6 +127,20 @@ mirror() {
   ${REPO} sync
 }
 
+patch_poky() {
+    cd sources/poky
+    found=$(git rev-list --grep="bitbake: cooker: add support for using % as a wildcard in bbappend filename" HEAD)
+    if [ -z "$found" ]; then
+        git cherry-pick 381d5920188398bc53b2454843054c8690bca243 > /dev/null
+    fi
+
+    found=$(git rev-list --grep="bitbake: cooker: Fix support for wildcards in bbappend filenames" HEAD)
+    if [ -z "$found" ]; then
+        git cherry-pick f91a3f46a1ee586e330be0868e8fbc4d2e78d361 > /dev/null
+    fi
+    cd -
+}
+
 init() {
   if [ -z "${DEVICE}" ]; then
     echo "device not defined"
@@ -142,6 +159,8 @@ init() {
   ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
   ${REPO} sync
 
+  patch_poky
+
   if [ ! -e "sources/meta-b2qt" ]; then
     ln -s ${DIR} sources/meta-b2qt
   fi
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
new file mode 100644
index 0000000..9b5dd05
--- /dev/null
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -0,0 +1,44 @@
+#############################################################################
+##
+## 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://qt.digia.com/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-fsl-arm \
+  ${BSPDIR}/sources/meta-tibidabo \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
new file mode 100644
index 0000000..c937f4a
--- /dev/null
+++ b/conf/distro/include/tibidabo.conf
@@ -0,0 +1,50 @@
+#############################################################################
+##
+## 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://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+IMAGE_FSTYPES = "tar.gz"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    bootscript:bootscript \
+    "
+BOOTFS_DEPENDS = "tibidabo-bootscript-sd:do_deploy virtual/kernel:do_deploy"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+
+module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture"
+
+ADB_PRODUCTID = "0x0000"
+
+BBMASK += "|meta-fsl-extras/recipes/u-boot|meta-fsl-extras/recipes/linux/linux-boundary"
diff --git a/meta-architech-extras/conf/layer.conf b/meta-architech-extras/conf/layer.conf
new file mode 100644
index 0000000..1cd742f
--- /dev/null
+++ b/meta-architech-extras/conf/layer.conf
@@ -0,0 +1,33 @@
+#############################################################################
+##
+## 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://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_architech"
+BBFILE_PATTERN_b2qt_architech := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_architech = "20"
diff --git a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd/0001-Updated-kernel-arguments-for-tibidabo.patch b/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd/0001-Updated-kernel-arguments-for-tibidabo.patch
new file mode 100644
index 0000000..6df6cd6
--- /dev/null
+++ b/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd/0001-Updated-kernel-arguments-for-tibidabo.patch
@@ -0,0 +1,17 @@
+From 020c8ffc859d03b26ae50d0b4cf008ec655e26a0 Mon Sep 17 00:00:00 2001
+From: aavit <eirik.aavitsland@theqtcompany.com>
+Date: Mon, 27 Oct 2014 12:41:32 +0100
+Subject: [PATCH] Updated kernel arguments for tibidabo
+
+
+diff --git a/recipes-bsp/bootscript/tibidabo-bootscript-sd-1.0/bootscript.source b/recipes-bsp/bootscript/tibidabo-bootscript-sd-1.0/bootscript.source
+index 1902d81..4247a08 100644
+--- a/bootscript.source
++++ b/bootscript.source
+@@ -1,5 +1,6 @@
+ setenv bootargs ${bootargs} vmalloc=400M root=/dev/mmcblk0p2 rw,rootwait consoleblank=0 video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 video=mxcfb1:dev=lcd,CLAA-WVGA,if=RGB666 fbmem=28M,10M
+ mmc dev 0
++setenv bootargs ${bootargs} vt.global_cursor_default=0
+ for file_system in fat ext2; do
+     ${file_system}load mmc 0:1 ${loadaddr} /uImage && bootm ${loadaddr}
+ done
diff --git a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend b/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend
new file mode 100644
index 0000000..d07b6a6
--- /dev/null
+++ b/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## 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://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-Updated-kernel-arguments-for-tibidabo.patch \
+        "
diff --git a/recipes/init-ifupdown/init-ifupdown/tibidabo/interfaces b/recipes/init-ifupdown/init-ifupdown/tibidabo/interfaces
new file mode 100644
index 0000000..cb45575
--- /dev/null
+++ b/recipes/init-ifupdown/init-ifupdown/tibidabo/interfaces
@@ -0,0 +1,37 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+        wireless_mode managed
+        wireless_essid any
+        wpa-driver wext
+        wpa-conf /etc/wpa_supplicant.conf
+
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+auto pt0
+iface pt0 inet dhcp
+    hostname `/bin/hostname`
+auto pt1
+iface pt1 inet dhcp
+    hostname `/bin/hostname`
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+iface usb0 inet static
+        address 192.168.7.2
+        netmask 255.255.255.0
+        network 192.168.7.0
+        gateway 192.168.7.1
+
+# Bluetooth networking
+iface bnep0 inet dhcp
diff --git a/recipes/wayland/wayland_1.4.0.bbappend b/recipes/wayland/wayland_1.%.bbappend
index 1c67f60..1c67f60 100644
--- a/recipes/wayland/wayland_1.4.0.bbappend
+++ b/recipes/wayland/wayland_1.%.bbappend
diff --git a/recipes/x264/x264_git.bbappend b/recipes/x264/x264_git.bbappend
new file mode 100644
index 0000000..ccbbbd1
--- /dev/null
+++ b/recipes/x264/x264_git.bbappend
@@ -0,0 +1,25 @@
+#############################################################################
+##
+## 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://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# Workaround: at the sha version defined by tibidabo, the x264 recipe
+# defines a nonexisting SRCREV sha.
+SRCREV_tibidabo = "ffc3ad4945da69f3caa2b40e4eed715a9a8d9526"
diff --git a/scripts/manifest_tibidabo.xml b/scripts/manifest_tibidabo.xml
new file mode 100644
index 0000000..97c18dd
--- /dev/null
+++ b/scripts/manifest_tibidabo.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <default sync-j="4" revision="dora"/>
+
+  <remote fetch="git://git.yoctoproject.org" name="yocto"/>
+  <remote fetch="git://git.openembedded.org" name="oe"/>
+  <remote fetch="git://github.com/Freescale" name="freescale"/>
+  <remote fetch="https://github.com/architech-boards/" name="architech"/>
+
+  <project name="poky"
+           remote="yocto"
+           revision="84c2763fa0bf08a83caa2c5ee532b5bef2ff918b"
+           path="sources/poky"/>
+  <project name="meta-openembedded"
+           remote="oe"
+           revision="40e0f371f3eb1628655c484feac0cebf810737b4"
+           path="sources/meta-openembedded"/>
+
+  <project name="meta-fsl-arm"
+           remote="yocto"
+           revision="fb1681666fac9c096314cd01242be4613b7ff140"
+           path="sources/meta-fsl-arm"
+           groups="notdefault,architech"/>
+  <project name="meta-tibidabo"
+           remote="architech"
+           revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
+           path="sources/meta-tibidabo"
+           groups="notdefault,architech"/>
+
+</manifest>
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index cc15776..16815a8 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -55,6 +55,9 @@ if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
     imx53qsb|imx6qsabresd|nitrogen6x)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
+    tibidabo)
+      LAYERSCONF="bblayers.conf.tibidabo.sample"
+    ;;
     beagleboard|am335x-evm)
       LAYERSCONF="bblayers.conf.ti.sample"
     ;;