From 0d5594111ea1712f731cff174f21b3e2c4246c15 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Feb 2016 13:23:56 +0200 Subject: kontron: update to Yocto BSP for SMARC-sAMX6i R02.00 Change-Id: If0f8dc2c786bc63fba69531fa009efd8ae8111b7 Reviewed-by: Teemu Holappa --- b2qt-init-build-env | 5 ++- conf/bblayers.conf.smx6.sample | 50 ++++++++++++++++++++++ conf/distro/include/smarc-samx6i.conf | 3 ++ meta-smx6-extras/conf/layer.conf | 37 ++++++++++++++++ .../recipes/linux/linux-smx6_3.14.28.bbappend | 26 +++++++++++ scripts/manifest.xml | 10 ++++- scripts/manifest_fido.xml | 7 ++- scripts/setup-environment.sh | 5 ++- 8 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 conf/bblayers.conf.smx6.sample create mode 100644 meta-smx6-extras/conf/layer.conf create mode 100644 meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend diff --git a/b2qt-init-build-env b/b2qt-init-build-env index e3c619b..90fa2b0 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -95,9 +95,12 @@ get_groups() { apalis-imx6|colibri-imx6|colibri-vf) PROJECT_GROUPS="toradex" ;; - imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i) + imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) PROJECT_GROUPS="fsl" ;; + smarc-samx6i) + PROJECT_GROUPS="smx6" + ;; tibidabo) PROJECT_GROUPS="architech" ;; diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample new file mode 100644 index 0000000..f604394 --- /dev/null +++ b/conf/bblayers.conf.smx6.sample @@ -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$ +## +############################################################################## + +# 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-fsl-arm-extra \ + ${BSPDIR}/sources/meta-smx6 \ + ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ + ${BSPDIR}/sources/meta-b2qt \ + ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ + ${BSPDIR}/sources/meta-b2qt/meta-smx6-extras \ + ${BSPDIR}/sources/meta-mingw \ + ${BSPDIR}/sources/meta-qt5 \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ${BSPDIR}/sources/poky/meta \ + ${BSPDIR}/sources/poky/meta-yocto \ + " diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf index 23bc85f..d3ce2c9 100644 --- a/conf/distro/include/smarc-samx6i.conf +++ b/conf/distro/include/smarc-samx6i.conf @@ -45,3 +45,6 @@ MACHINE_EXTRA_INSTALL_SDK += " \ " KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" + +BBMASK ?= " " +BBMASK .= "|meta-smx6/recipes-qt" diff --git a/meta-smx6-extras/conf/layer.conf b/meta-smx6-extras/conf/layer.conf new file mode 100644 index 0000000..097fefe --- /dev/null +++ b/meta-smx6-extras/conf/layer.conf @@ -0,0 +1,37 @@ +############################################################################## +## +## 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$ +## +############################################################################## + +# 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_smx6" +BBFILE_PATTERN_b2qt_smx6 := "^${LAYERDIR}/" +BBFILE_PRIORITY_b2qt_smx6 = "20" + +# meta-smx6 depends on fsl-demos, but that's not needed +LAYERDEPENDS_smx6 = "" +# meta-smx6 layer.conf modifies qtbase PACKAGECONFIG +PACKAGECONFIG_remove_pn-qtbase = "examples" diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend new file mode 100644 index 0000000..00f3c11 --- /dev/null +++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend @@ -0,0 +1,26 @@ +############################################################################## +## +## 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$ +## +############################################################################## + +do_configure_prepend() { + echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig + echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig + echo "CONFIG_CGROUPS=y" >> ${WORKDIR}/defconfig +} diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 703aedc..71686c1 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -37,7 +37,7 @@ remote="yocto" revision="c9f259a4bf8472dfa3ff75f1c3fcbe5e0ded7aaf" path="sources/meta-fsl-arm" - groups="notdefault,fsl,toradex,architech,ti,bbb"/> + groups="notdefault,fsl,toradex,architech,ti,bbb,smx6"/> + groups="notdefault,fsl,toradex,architech,smx6"/> + + diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml index 2945e88..3a13f40 100644 --- a/scripts/manifest_fido.xml +++ b/scripts/manifest_fido.xml @@ -73,6 +73,7 @@ revision="fido" path="sources/meta-intel" groups="notdefault,nuc"/> + - + diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index f681d14..28adeec 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -51,9 +51,12 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then apalis-imx6|colibri-imx6|colibri-vf) LAYERSCONF="bblayers.conf.toradex.sample" ;; - imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i) + imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) LAYERSCONF="bblayers.conf.fsl.sample" ;; + smarc-samx6i) + LAYERSCONF="bblayers.conf.smx6.sample" + ;; tibidabo) LAYERSCONF="bblayers.conf.tibidabo.sample" ;; -- cgit v1.2.3-54-g00ecf