Skip to content

Commit

Permalink
Variscite: preliminary support for iMX8 SoMs family
Browse files Browse the repository at this point in the history
  • Loading branch information
varigigi committed Jan 29, 2020
1 parent bfc5497 commit 06f27a6
Show file tree
Hide file tree
Showing 10 changed files with 279 additions and 3 deletions.
3 changes: 3 additions & 0 deletions b2qt-init-build-env
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ get_groups() {
all)
PROJECT_GROUPS="external"
;;
imx8mm-var-dart|imx8mq-var-dart|imx8qm-var-som|imx8qxp-var-som)
PROJECT_GROUPS="variscite-imx"
;;
imx8*)
PROJECT_GROUPS="fsl-imx8"
;;
Expand Down
56 changes: 56 additions & 0 deletions meta-boot2qt-distro/conf/bblayers.conf.variscite-imx.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## 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 https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################

# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
# changes incompatibly
POKY_BBLAYERS_CONF_VERSION = "2"

BBPATH = "${TOPDIR}"
BBFILES ?= ""
BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"

BBLAYERS ?= " \
${BSPDIR}/sources/poky/meta \
${BSPDIR}/sources/poky/meta-poky \
${BSPDIR}/sources/meta-fsl-bsp-release/imx/meta-bsp \
${BSPDIR}/sources/meta-fsl-bsp-release/imx/meta-sdk \
${BSPDIR}/sources/meta-freescale \
${BSPDIR}/sources/meta-freescale-3rdparty \
${BSPDIR}/sources/meta-variscite-imx \
${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-multimedia \
${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
${BSPDIR}/sources/meta-mingw \
${BSPDIR}/sources/meta-qt5 \
"
32 changes: 32 additions & 0 deletions meta-boot2qt-distro/conf/distro/include/imx8mm-var-dart.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## 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 https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################

include conf/distro/include/variscite.inc

DEPLOY_CONF_NAME = "Variscite DART-MX8M Mini"
32 changes: 32 additions & 0 deletions meta-boot2qt-distro/conf/distro/include/imx8mq-var-dart.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## 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 https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################

include conf/distro/include/variscite.inc

DEPLOY_CONF_NAME = "Variscite DART-MX8M"
38 changes: 38 additions & 0 deletions meta-boot2qt-distro/conf/distro/include/imx8qm-var-som.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## 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 https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################

include conf/distro/include/variscite.inc

DEPLOY_CONF_NAME = "Variscite VAR-SOM-MX8"

IMAGE_BOOT_FILES += "\
dpfw.bin \
hdmirxfw.bin \
hdmitxfw.bin \
"
32 changes: 32 additions & 0 deletions meta-boot2qt-distro/conf/distro/include/imx8qxp-var-som.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## 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 https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################

include conf/distro/include/variscite.inc

DEPLOY_CONF_NAME = "Variscite VAR-SOM-MX8X"
55 changes: 55 additions & 0 deletions meta-boot2qt-distro/conf/distro/include/variscite.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## 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 https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################

include conf/distro/include/fsl-imx8.inc

IMAGE_BOOT_FILES_remove = "Image"
IMAGE_BOOT_FILES_prepend = "Image.gz"

IMAGE_FSTYPES_remove = "ext3"
IMAGE_FSTYPES += "tar.gz"

# recovery SD dependencies and test tools
IMAGE_INSTALL_append = " \
alsa-utils \
boot2qt-demo-camera \
can-utils \
e2fsprogs-mke2fs \
evtest \
imx-gst1.0-plugin-gplay \
iperf3 \
pulseaudio-server \
tar \
"

WKS_FILE = "imx8-uboot-singlepart.wks.in"

BBMASK += " \
meta-variscite-imx/recipes-fsl/images/fsl-image-gui.bbappend \
"
19 changes: 19 additions & 0 deletions meta-fsl-extras/wic/imx8-uboot-singlepart.wks.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# short-description: Create SD card image with a boot partition
# long-description:
# Create an image that can be written onto a SD card using dd for use
# with i.MX SoC family
# It uses u-boot + other binaries gathered together on imx-boot file
#
# The disk layout used is:
# - ---------- --------------
# | | imx-boot | rootfs |
# - ---------- --------------
# ^ ^ ^ ^
# | | | |
# 0 | 8MiB rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
# ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
#
part u-boot --source rawcopy --sourceparams="file=imx-boot-${MACHINE}-sd.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192

bootloader --ptable msdos
12 changes: 9 additions & 3 deletions scripts/manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<remote fetch="git://github.com/boundarydevices" name="boundary"/>
<remote fetch="git://github.com/toradex" name="toradex-github"/>
<remote fetch="git://source.codeaurora.org/external/imx" name="aurora-imx"/>
<remote fetch="git://github.com/varigit" name="variscite"/>

<project name="poky"
remote="yocto"
Expand All @@ -38,12 +39,12 @@
remote="freescale"
revision="27ca94f8a4336790ba117b4298566f6820e7e74c"
path="sources/meta-freescale"
groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8"/>
groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8,variscite-imx"/>
<project name="meta-freescale-3rdparty"
remote="freescale"
revision="82037216280a39957fb4272581637abec734ad50"
path="sources/meta-freescale-3rdparty"
groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8"/>
groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8,variscite-imx"/>
<project name="meta-raspberrypi"
remote="yocto"
revision="2d40b000021bc8a9ef7f329ed0ad410f8d227b97"
Expand Down Expand Up @@ -93,12 +94,17 @@
remote="aurora-imx"
revision="cb65aa03c70d0b88cdc2b06eb56ab59ae01f54bf"
path="sources/meta-fsl-bsp-release"
groups="notdefault,external,fsl-imx8"/>
groups="notdefault,external,fsl-imx8,variscite-imx"/>
<project name="meta-fsl-bsp-release"
remote="toradex-github"
revision="55754a3cc79759f18fa1df88ae2ffa91fbd87d84"
path="sources/meta-fsl-bsp-release-toradex"
groups="notdefault,external,toradex-imx8"/>
<project name="meta-variscite-imx"
remote="variscite"
revision="73c39ae391003dcd2276dd4d92a3d21038882a88"
path="sources/meta-variscite-imx"
groups="notdefault,external,variscite-imx"/>

<project name="nvidia-layer"
remote="playground"
Expand Down
3 changes: 3 additions & 0 deletions scripts/setup-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}

if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
case ${MACHINE} in
imx8mm-var-dart|imx8mq-var-dart|imx8qm-var-som|imx8qxp-var-som)
LAYERSCONF="bblayers.conf.variscite-imx.sample"
;;
imx8*)
LAYERSCONF="bblayers.conf.fsl-imx8.sample"
;;
Expand Down

0 comments on commit 06f27a6

Please sign in to comment.