From 47ed64e5a9a2dfbd9ba8d769349295397df7db2b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 18 Sep 2019 09:44:26 +0300 Subject: toradex: update layers to 3.0b2.65-20190830 Toradex kernel and u-boot were updated to versions 4.14 and 2019.07. The meta-fsl-bsp-release layer is no longer used with the imx8 boards. The colibri-imx8qxp was renamed to colibri-imx8x and Colibri VF is no longer support on the toradex layer. Change-Id: I8ebb061b6f7fb36f9c8b9aaca4aafbecb3cbf1dc Reviewed-by: Mikko Gronoff --- b2qt-init-build-env | 5 +- .../classes/image_type_tezi_warrior.bbclass | 250 --------------------- .../conf/bblayers.conf.toradex-imx8.sample | 54 ----- .../conf/distro/include/apalis-imx8.conf | 7 +- .../conf/distro/include/colibri-imx6ull.conf | 2 + .../conf/distro/include/colibri-imx8qxp.conf | 32 --- .../conf/distro/include/colibri-imx8x.conf | 32 +++ .../conf/distro/include/colibri-vf.conf | 47 ---- .../conf/distro/include/toradex-imx8.inc | 37 --- .../conf/distro/include/toradex.inc | 32 +-- .../recipes-bsp/u-boot/u-boot-script-toradex.bb | 2 +- .../colibri-vf/0001-Update-only-u-boot.patch | 54 ----- .../u-boot-script-toradex/colibri-vf/flash_blk.scr | 28 --- .../u-boot-script-toradex/colibri-vf/flash_eth.scr | 28 --- .../0001-Make-sdboot-default-on-all-boards.patch | 85 ++++--- ...-test-for-Capacitive-Touch-Display-7-Para.patch | 12 +- .../0003-apalis-imx6-Ixora-v1.0-support.patch | 35 --- ...-lower-default-resolution-on-HDMI-to-720p.patch | 8 +- .../recipes-bsp/u-boot/u-boot-toradex_%.bbappend | 36 --- .../u-boot/u-boot-toradex_2019%.bbappend | 35 +++ ...01-Enable-atmel-mxt-multitouch-controller.patch | 62 ++++- .../linux/linux-toradex_4.%.bbappend | 3 - .../linux/linux-toradex_4.14%.bbappend | 32 +++ .../linux/linux-toradex_4.9-2.3.x.bbappend | 32 --- scripts/manifest.xml | 10 +- scripts/setup-environment.sh | 5 +- 26 files changed, 228 insertions(+), 737 deletions(-) delete mode 100644 meta-boot2qt-distro/classes/image_type_tezi_warrior.bbclass delete mode 100644 meta-boot2qt-distro/conf/bblayers.conf.toradex-imx8.sample delete mode 100644 meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf create mode 100644 meta-boot2qt-distro/conf/distro/include/colibri-imx8x.conf delete mode 100644 meta-boot2qt-distro/conf/distro/include/colibri-vf.conf delete mode 100644 meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_%.bbappend create mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2019%.bbappend create mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.14%.bbappend delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.9-2.3.x.bbappend diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 6f2b7a0d..dbb0ab65 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -151,10 +151,7 @@ get_groups() { imx8*) PROJECT_GROUPS="fsl-imx8" ;; - apalis-imx8|colibri-imx8qxp) - PROJECT_GROUPS="toradex-imx8" - ;; - apalis-imx6|colibri-imx6|colibri-imx6ull|colibri-vf|colibri-imx7|colibri-imx7-emmc) + apalis-*|colibri-*) PROJECT_GROUPS="toradex" ;; nitrogen6x|nitrogen7|nitrogen8m|nitrogen8mm) diff --git a/meta-boot2qt-distro/classes/image_type_tezi_warrior.bbclass b/meta-boot2qt-distro/classes/image_type_tezi_warrior.bbclass deleted file mode 100644 index 22af0713..00000000 --- a/meta-boot2qt-distro/classes/image_type_tezi_warrior.bbclass +++ /dev/null @@ -1,250 +0,0 @@ -inherit image_types - -do_image_teziimg[depends] += "tezi-metadata:do_deploy virtual/bootloader:do_deploy" - -TEZI_ROOT_FSTYPE ??= "ext4" -UBOOT_BINARY ??= "u-boot.${UBOOT_SUFFIX}" -UBOOT_BINARY_TEZI = "${UBOOT_BINARY}" -UBOOT_BINARY_TEZI_apalis-t30 = "apalis_t30.img" -UBOOT_BINARY_TEZI_apalis-tk1 = "apalis-tk1.img" -UBOOT_BINARY_TEZI_apalis-tk1-mainline = "apalis-tk1.img" -UBOOT_ENV_TEZI = "uEnv.txt" - -def rootfs_get_size(d): - import subprocess - - # Calculate size of rootfs in kilobytes... - output = subprocess.check_output(['du', '-ks', - d.getVar('IMAGE_ROOTFS', True)]) - return int(output.split()[0]) - -def rootfs_tezi_emmc(d): - import subprocess - from collections import OrderedDict - deploydir = d.getVar('DEPLOY_DIR_IMAGE', True) - kernel = d.getVar('KERNEL_IMAGETYPE', True) - offset_bootrom = d.getVar('OFFSET_BOOTROM_PAYLOAD', True) - offset_spl = d.getVar('OFFSET_SPL_PAYLOAD', True) - imagename = d.getVar('IMAGE_NAME', True) - imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True) - - # Calculate size of bootfs... - bootfiles = [ os.path.join(deploydir, kernel) ] - has_devicetree = d.getVar('KERNEL_DEVICETREE', True) - if has_devicetree: - for dtb in d.getVar('KERNEL_DEVICETREE', True).split(): - bootfiles.append(os.path.join(deploydir, dtb)) - - args = ['du', '-kLc'] - args.extend(bootfiles) - output = subprocess.check_output(args) - bootfssize_kb = int(output.splitlines()[-1].split()[0]) - - bootpart_rawfiles = [] - - has_spl = d.getVar('SPL_BINARY', True) - if has_spl: - bootpart_rawfiles.append( - { - "filename": d.getVar('SPL_BINARY', True), - "dd_options": "seek=" + offset_bootrom - }) - bootpart_rawfiles.append( - { - "filename": d.getVar('UBOOT_BINARY_TEZI', True), - "dd_options": "seek=" + (offset_spl if has_spl else offset_bootrom) - }) - - return [ - OrderedDict({ - "name": "mmcblk0", - "partitions": [ - { - "partition_size_nominal": 16, - "want_maximised": False, - "content": { - "label": "BOOT", - "filesystem_type": "FAT", - "mkfs_options": "", - "filename": imagename + ".bootfs.tar.xz", - "uncompressed_size": bootfssize_kb / 1024 - } - }, - { - "partition_size_nominal": 512, - "want_maximised": True, - "content": { - "label": "RFS", - "filesystem_type": d.getVar('TEZI_ROOT_FSTYPE', True), - "mkfs_options": "-E nodiscard", - "filename": imagename + imagename_suffix + ".tar.xz", - "uncompressed_size": rootfs_get_size(d) / 1024 - } - } - ] - }), - OrderedDict({ - "name": "mmcblk0boot0", - "content": { - "filesystem_type": "raw", - "rawfiles": bootpart_rawfiles - } - })] - - -def rootfs_tezi_rawnand(d): - from collections import OrderedDict - imagename = d.getVar('IMAGE_NAME', True) - imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True) - - # Use device tree mapping to create product id <-> device tree relationship - dtmapping = d.getVarFlags('TORADEX_PRODUCT_IDS') - dtfiles = [] - for f, v in dtmapping.items(): - dtfiles.append({ "filename": v, "product_ids": f }) - - return [ - OrderedDict({ - "name": "u-boot1", - "content": { - "rawfile": { - "filename": d.getVar('UBOOT_BINARY_TEZI', True), - "size": 1 - } - }, - }), - OrderedDict({ - "name": "u-boot2", - "content": { - "rawfile": { - "filename": d.getVar('UBOOT_BINARY_TEZI', True), - "size": 1 - } - } - }), - OrderedDict({ - "name": "ubi", - "ubivolumes": [ - { - "name": "kernel", - "size_kib": 8192, - "type": "static", - "content": { - "rawfile": { - "filename": d.getVar('KERNEL_IMAGETYPE', True), - "size": 5 - } - } - }, - { - "name": "dtb", - "content": { - "rawfiles": dtfiles - }, - "size_kib": 128, - "type": "static" - }, - { - "name": "m4firmware", - "size_kib": 896, - "type": "static" - }, - { - "name": "rootfs", - "content": { - "filesystem_type": "ubifs", - "filename": imagename + imagename_suffix + ".tar.xz", - "uncompressed_size": rootfs_get_size(d) / 1024 - } - } - ] - })] - -python rootfs_tezi_json() { - import json - from collections import OrderedDict - from datetime import datetime - - deploydir = d.getVar('DEPLOY_DIR_IMAGE', True) - # patched in IMAGE_CMD_teziimg() below - release_date = "%release_date%" - - data = OrderedDict({ "config_format": 2, "autoinstall": False }) - - # Use image recipes SUMMARY/DESCRIPTION/PV... - data["name"] = d.getVar('SUMMARY', True) - data["description"] = d.getVar('DESCRIPTION', True) - data["version"] = d.getVar('PV', True) - data["release_date"] = release_date - data["u_boot_env"] = d.getVar('UBOOT_ENV_TEZI', True) - if os.path.exists(os.path.join(deploydir, "prepare.sh")): - data["prepare_script"] = "prepare.sh" - if os.path.exists(os.path.join(deploydir, "wrapup.sh")): - data["wrapup_script"] = "wrapup.sh" - if os.path.exists(os.path.join(deploydir, "marketing.tar")): - data["marketing"] = "marketing.tar" - if os.path.exists(os.path.join(deploydir, "toradexlinux.png")): - data["icon"] = "toradexlinux.png" - - product_ids = d.getVar('TORADEX_PRODUCT_IDS', True) - if product_ids is None: - bb.fatal("Supported Toradex product ids missing, assign TORADEX_PRODUCT_IDS with a list of product ids.") - - data["supported_product_ids"] = d.getVar('TORADEX_PRODUCT_IDS', True).split() - - if bb.utils.contains("TORADEX_FLASH_TYPE", "rawnand", True, False, d): - data["mtddevs"] = rootfs_tezi_rawnand(d) - else: - data["blockdevs"] = rootfs_tezi_emmc(d) - - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE', True) - with open(os.path.join(deploy_dir, 'image.json'), 'w') as outfile: - json.dump(data, outfile, indent=4) - bb.note("Toradex Easy Installer metadata file image.json written.") -} - -do_image_teziimg[prefuncs] += "rootfs_tezi_json" - -IMAGE_CMD_teziimg () { - bbnote "Create bootfs tarball" - - # Fixup release_date in image.json, convert ${DATE} to isoformat - # This works around the non fatal ERRORS: "the basehash value changed" when DATE is referenced - # in a python prefunction to do_image - ISODATE=`echo ${DATE} | sed 's/\(....\)\(..\)\(..\)/\1-\2-\3/'` - sed -i "s/%release_date%/$ISODATE/" ${DEPLOY_DIR_IMAGE}/image.json - - # Create list of device tree files - if test -n "${KERNEL_DEVICETREE}"; then - for DTS_FILE in ${KERNEL_DEVICETREE}; do - DTS_BASE_NAME=`basename ${DTS_FILE} .dtb` - if [ -e "${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb" ]; then - KERNEL_DEVICETREE_FILES="${KERNEL_DEVICETREE_FILES} ${DTS_BASE_NAME}.dtb" - else - bbfatal "${DTS_FILE} does not exist." - fi - done - fi - - cd ${DEPLOY_DIR_IMAGE} - - case "${TORADEX_FLASH_TYPE}" in - rawnand) - # The first transform strips all folders from the files to tar, the - # second transform "moves" them in a subfolder ${IMAGE_NAME}_${PV}. - # The third transform removes zImage from the device tree. - ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz - ;; - *) - # Create bootfs... - ${IMAGE_CMD_TAR} --transform="flags=r;s|${KERNEL_IMAGETYPE}-||" -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar -C ${DEPLOY_DIR_IMAGE} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} - xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar > ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz - - # The first transform strips all folders from the files to tar, the - # second transform "moves" them in a subfolder ${IMAGE_NAME}-Tezi_${PV}. - ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz - ;; - esac -} - -IMAGE_TYPEDEP_teziimg += "tar.xz" diff --git a/meta-boot2qt-distro/conf/bblayers.conf.toradex-imx8.sample b/meta-boot2qt-distro/conf/bblayers.conf.toradex-imx8.sample deleted file mode 100644 index d00642bb..00000000 --- a/meta-boot2qt-distro/conf/bblayers.conf.toradex-imx8.sample +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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-toradex/imx/meta-bsp \ - ${BSPDIR}/sources/meta-fsl-bsp-release-toradex/imx/meta-sdk \ - ${BSPDIR}/sources/meta-freescale \ - ${BSPDIR}/sources/meta-freescale-3rdparty \ - ${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-mingw \ - ${BSPDIR}/sources/meta-qt5 \ - " diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf index a4ab713e..5cc09d4c 100644 --- a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf +++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf @@ -27,11 +27,6 @@ ## ############################################################################ -include conf/distro/include/toradex-imx8.inc +include conf/distro/include/toradex.inc DEPLOY_CONF_NAME = "Toradex Apalis iMX8" - -IMAGE_BOOT_FILES += "\ - dpfw.bin \ - hdmitxfw.bin \ - " diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf index d0e6ee62..4492bfcd 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf @@ -39,6 +39,8 @@ IMAGE_BOOT_FILES += " \ u-boot-${MACHINE}.imx;${MACHINEDIR}/u-boot.imx \ " +UBOOT_MAKE_TARGET = "u-boot.imx" + PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf deleted file mode 100644 index 4ed5c077..00000000 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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/toradex-imx8.inc - -DEPLOY_CONF_NAME = "Toradex Colibri iMX8QXP" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx8x.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx8x.conf new file mode 100644 index 00000000..33fea544 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx8x.conf @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2019 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/toradex.inc + +DEPLOY_CONF_NAME = "Toradex Colibri iMX8X" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf deleted file mode 100644 index 2937acc7..00000000 --- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 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/toradex.inc - -DEPLOY_CONF_NAME = "Toradex Colibri VF" - -IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" - -IMAGE_BOOT_FILES += " \ - u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \ - " - -PREFERRED_PROVIDER_virtual/egl = "opengldummy" -PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" - -DISTRO_FEATURES_remove = "webengine wayland vulkan" - -BOOT2QT_DEMOS_remove = "boot2qt-demo-qtgraphicaleffects boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser" - -QT_USE_SOFTWARE_CONTEXT = "1" diff --git a/meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc b/meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc deleted file mode 100644 index 7ad1b5af..00000000 --- a/meta-boot2qt-distro/conf/distro/include/toradex-imx8.inc +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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 - -FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release-toradex/imx/EULA.txt" - -# Keep the original version -PREFERRED_VERSION_linux-libc-headers_imx = "4.14" -PV_pn-linux-libc-headers = "4.14" - diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 44ab7404..e98f1ca8 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -30,29 +30,31 @@ include conf/distro/include/fsl.inc # include file from meta-toradex-nxp -require conf/machine/include/${MACHINE}.inc +include conf/machine/include/${MACHINE}.inc BBMASK += "\ - meta-toradex-nxp/recipes-graphics/wayland \ - meta-toradex-nxp/recipes-graphics/xorg-xserver \ - meta-toradex-nxp/recipes-multimedia/gstreamer \ - meta-toradex-nxp/recipes-multimedia/imx-codec \ - meta-toradex-bsp-common/recipes-devtools/python \ - meta-toradex-bsp-common/recipes-devtools/e2fsprogs \ - meta-toradex-bsp-common/recipes-core/systemd \ - " + meta-toradex-nxp/recipes-graphics/xorg-xserver \ + meta-toradex-bsp-common/recipes-core/systemd \ +" -PREFERRED_PROVIDER_u-boot = "u-boot-toradex" +BBMASK_append_mx6 = "\ + meta-toradex-nxp/recipes-graphics/wayland/weston_4.0.0.imx.bbappend \ +" -WKS_FILE_DEPENDS += "u-boot-script-toradex" +PREFERRED_VERSION_wayland-protocols_mx6 = "1.16.imx" + +WKS_FILE_DEPENDS_append_mx6 = " u-boot-script-toradex" +WKS_FILE_DEPENDS_append_mx7 = " u-boot-script-toradex" MACHINEDIR = "${@d.getVar('MACHINE').replace('-','_')}" -IMAGE_BOOT_FILES += " \ + +SCRIPTS = "\ fwd_blk.img;flash_blk.img \ fwd_eth.img;flash_eth.img \ fwd_mmc.img;flash_mmc.img \ ${MACHINE}/*;${MACHINEDIR}/ \ - " +" +IMAGE_BOOT_FILES_append_mx6 += "${SCRIPTS}" +IMAGE_BOOT_FILES_append_mx7 += "${SCRIPTS}" -# override tezi bbclass -IMAGE_CLASSES_append = " image_type_tezi_warrior" +IMAGE_FSTYPES += "teziimg" diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex.bb b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex.bb index 464c1fb4..76da5608 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex.bb +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex.bb @@ -31,7 +31,7 @@ LICENSE = "The-Qt-Company-Commercial" LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625" DEPENDS = "u-boot-mkimage-native" -PV = "2.8b3" +PV = "3.0b2" SRC_URI = " \ file://fwd_mmc.scr \ diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch deleted file mode 100644 index 2aa8421a..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7d0fc874871d79125b1c17b32fec9742b2f5839e Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 14 Sep 2016 10:22:27 +0300 -Subject: [PATCH] Update only u-boot - ---- - flash_blk.scr | 4 ++-- - flash_eth.scr | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/flash_blk.scr b/flash_blk.scr -index ae0fd5c..1b34c75 100644 ---- a/flash_blk.scr -+++ b/flash_blk.scr -@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImag - setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' - setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' - --setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' -+setenv update_new 'run update_uboot; reset' - - # Upgrade part 1, write new U-Boot, but with old ECC format still... - # Store config block temporarly in memory at kernel_addr_r. -@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 - setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' - - # Upgrade part 2, use new ECC format for the whole device... --setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' -+setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}' - setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' - - # fsl_nfc indicates old NAND format (24-bit ECC), start migration process -diff --git a/flash_eth.scr b/flash_eth.scr -index b0e4904..0a8e3cc 100644 ---- a/flash_eth.scr -+++ b/flash_eth.scr -@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write $ - setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' - setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' - --setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' -+setenv update_new 'run update_uboot; reset' - - # Upgrade part 1, write new U-Boot, but with old ECC format still... - # Store config block temporarly in memory at kernel_addr_r. -@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 - setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' - - # Upgrade part 2, use new ECC format for the whole device... --setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' -+setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}' - setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' - - # fsl_nfc indicates old NAND format (24-bit ECC), start migration process diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr deleted file mode 100644 index ae0fd5c1..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr +++ /dev/null @@ -1,28 +0,0 @@ -setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' -setenv update_configblock 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 0x800 ${filesize}' - -# Migrate to UBI volume based boot schema -setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' -setenv prepare_rootfs 'ubi create rootfs 0 dynamic' -setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' - -setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot' -setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' -setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' -setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' - -setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' - -# Upgrade part 1, write new U-Boot, but with old ECC format still... -# Store config block temporarly in memory at kernel_addr_r. -setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' -setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' - -# Upgrade part 2, use new ECC format for the whole device... -setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' -setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' - -# fsl_nfc indicates old NAND format (24-bit ECC), start migration process -setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' - -echo 'enter "run update" to update the entire module' diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr deleted file mode 100644 index b0e4904e..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr +++ /dev/null @@ -1,28 +0,0 @@ -setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' -setenv update_configblock 'tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 0x800 ${filesize}' - -# Migrate to UBI volume based boot schema -setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' -setenv prepare_rootfs 'ubi create rootfs 0 dynamic' -setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' - -setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot' -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' -setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' -setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' - -setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' - -# Upgrade part 1, write new U-Boot, but with old ECC format still... -# Store config block temporarly in memory at kernel_addr_r. -setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' -setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' - -# Upgrade part 2, use new ECC format for the whole device... -setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' -setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' - -# fsl_nfc indicates old NAND format (24-bit ECC), start migration process -setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' - -echo 'enter "run update" to update the entire module' diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch index df1429b0..fc1f12b3 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch @@ -1,71 +1,68 @@ -From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 Mon Sep 17 00:00:00 2001 +From 1c9c4c4e663c9649e1103a777a3d43c7972b514e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 May 2017 15:31:36 +0300 Subject: [PATCH] Make sdboot default on all boards ... and remove console=tty1 from kernel args --- - include/configs/apalis_imx6.h | 5 +++-- - include/configs/colibri_imx6.h | 5 +++-- - include/configs/colibri_imx7.h | 2 +- + include/configs/apalis_imx6.h | 3 ++- + include/configs/colibri_imx6.h | 3 ++- + include/configs/colibri_imx7.h | 3 ++- include/configs/colibri_vf.h | 2 +- - 4 files changed, 8 insertions(+), 6 deletions(-) + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index fa40c629c3..ad0284de8a 100644 +index db37fa7b73..b871e25eb3 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h -@@ -177,8 +177,9 @@ - #ifdef CONFIG_TDX_EASY_INSTALLER - #define CONFIG_BOOTCOMMAND "run distro_bootcmd" - #else --#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \ -- "run distro_bootcmd; usb start; " \ -+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \ -+ "run emmcboot; echo; echo emmcboot failed; " \ -+ "run distro_bootcmd; usb start; " \ - "setenv stdout serial,vga; setenv stdin serial,usbkbd" +@@ -205,7 +205,8 @@ #endif - + #define CONFIG_EXTRA_ENV_SETTINGS \ + BOOTENV \ +- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ ++ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ ++ "run emmcboot ; echo ; echo emmcboot failed ; " \ + "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \ + "usb start ; " \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h -index fda171bd9e..df49efc9ef 100644 +index 86f3f0d4fa..f6b4295209 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h -@@ -157,8 +157,9 @@ - #ifdef CONFIG_TDX_EASY_INSTALLER - #define CONFIG_BOOTCOMMAND "run distro_bootcmd" - #else --#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \ -- "run distro_bootcmd; usb start; " \ -+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \ -+ "run emmcboot ; echo ; echo emmcboot failed ; " \ -+ "run distro_bootcmd; usb start; " \ - "setenv stdout serial,vga; setenv stdin serial,usbkbd" - #endif - +@@ -187,7 +187,8 @@ + #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" + #define CONFIG_EXTRA_ENV_SETTINGS \ + BOOTENV \ +- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ ++ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ ++ "run emmcboot ; echo ; echo emmcboot failed ; " \ + "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \ + "usb start ; " \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h -index 6c91951878..4200512fea 100644 +index 5408577661..d5918d1e2d 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h -@@ -128,7 +128,7 @@ - #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \ - "run bootcmd_mmc0; run ubiboot; run distro_bootcmd" - #else --#define CONFIG_BOOTCOMMAND "run ubiboot; " \ -+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ - "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd" - #endif +@@ -115,7 +115,8 @@ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) +-#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \ ++#define CONFIG_BOOTCOMMAND "run sdboot ; echo ; echo sdboot failed ; " \ ++ "run ubiboot ; echo ; echo ubiboot failed ; " \ + "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" + #define MODULE_EXTRA_ENV_SETTINGS \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h -index 0579bfdc4e..65a5dada5f 100644 +index da9a8426ec..51d29560bf 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h -@@ -155,7 +155,7 @@ - "ubi read ${fdt_addr_r} dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ +@@ -93,7 +93,7 @@ + "ubi read ${fdt_addr_r} dtb && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run ubiboot; " \ +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" - #define BOOTENV_RUN_NET_USB_START "" + #define BOOT_TARGET_DEVICES(func) \ diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch index 080a8b59..d20f58cb 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch @@ -1,4 +1,4 @@ -From 22ded9f935249b8a3980e1a392b2598128f071d6 Mon Sep 17 00:00:00 2001 +From 37ecb16d9432b6aab050f4d609f268ce7553f85d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 19 May 2017 12:41:38 +0300 Subject: [PATCH] apalis-imx6: test for Capacitive Touch Display 7" Parallel @@ -13,11 +13,11 @@ support for the atmel_mxt_ts touch controller. 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 8dcb5cc5e4..59e74d41c0 100644 +index b871e25eb3..1ad8697c89 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h -@@ -249,7 +249,7 @@ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" +@@ -198,7 +198,7 @@ + #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 -#define FDT_FILE "imx6q-apalis-eval.dtb" @@ -25,14 +25,14 @@ index 8dcb5cc5e4..59e74d41c0 100644 #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb" #else #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" -@@ -279,9 +279,14 @@ +@@ -229,9 +229,14 @@ "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \ " ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ - "setup=setenv setupargs fec_mac=${ethaddr} " \ + "setup=run setupvideo; setenv setupargs fec_mac=${ethaddr} " \ "consoleblank=0 no_console_suspend=1 console=tty1 " \ - "console=${console},${baudrate}n8\0" \ + "console=${console},${baudrate}n8\0 " \ + "setupvideo=i2c dev 0; if i2c probe 4A; " \ + "then setenv vidargs mxc_hdmi.only_cea=1 " \ + "video=mxcfb0:dev=lcd,FusionF07A,if=RGB24 " \ diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch deleted file mode 100644 index 8d28abe6..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 166dae45bcfcd92cd2802db785a30072f65c0900 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 12 Oct 2017 11:02:54 +0300 -Subject: [PATCH] apalis-imx6: Ixora v1.0 support - -Add sddrive variable that can be changed to boot from different mmc card -slot when using different versions of ixora carrier board. -Default to drive 1, which is correct for Ixora v1.1. ---- - include/configs/apalis_imx6.h | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 3f224e54b8..9e1b5a0f75 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -238,12 +238,14 @@ - "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define SD_BOOTCMD \ -- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \ -- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ -+ "sddrive=1\0" \ -+ "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 rootwait\0" \ -+ "sdboot=run setup; run sdsetup; " \ -+ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \ -- "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \ -+ "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} ${boot_file} " \ - "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \ -- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ -+ "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define USB_BOOTCMD \ diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch index acc5a164..c5a83c48 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch @@ -1,4 +1,4 @@ -From 6c83b14450862c63ebd755fdf81afde43cddfe6c Mon Sep 17 00:00:00 2001 +From ae6e0bb4832fe30105eeb539a788f66763f62478 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 18 Oct 2017 13:20:25 +0300 Subject: [PATCH] apalis-imx6: lower default resolution on HDMI to 720p @@ -8,15 +8,15 @@ Subject: [PATCH] apalis-imx6: lower default resolution on HDMI to 720p 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 7aabb1334b..da34817a7a 100644 +index 55bb74ed8a..d90caa43f0 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h -@@ -294,7 +294,7 @@ +@@ -242,7 +242,7 @@ "source ${loadaddr}\0" \ "splashpos=m,m\0" \ "vidargs=mxc_hdmi.only_cea=1 " \ - "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \ + "video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \ "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ - "fbmem=32M\0" + "fbmem=32M\0 " diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_%.bbappend deleted file mode 100644 index 55a4c2bc..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_%.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-Make-sdboot-default-on-all-boards.patch \ - file://0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch \ - file://0003-apalis-imx6-Ixora-v1.0-support.patch \ - file://0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch \ - " diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2019%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2019%.bbappend new file mode 100644 index 00000000..4692a33f --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2019%.bbappend @@ -0,0 +1,35 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-Make-sdboot-default-on-all-boards.patch \ + file://0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch \ + file://0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch \ + " diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch index 1f63fee0..6e6256e9 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch @@ -1,4 +1,4 @@ -From 823475bf681e1dbb4ad8e43935232ae39b918d9c Mon Sep 17 00:00:00 2001 +From f976eba0ddc8bc97ab3049a6a2e4f87110ada029 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 6 Oct 2017 15:54:35 +0300 Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb @@ -6,14 +6,16 @@ Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb Need to disable fusion touch to get the new atmel mxt multitouch controller to work. --- - arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 3 ++- + arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 3 ++- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) -diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi -index 26525e24a6c7..78a1011c1ea2 100644 ---- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi -@@ -160,7 +160,7 @@ +diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +index 6c4aa68999a9..6ce362066c3b 100644 +--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts ++++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +@@ -243,7 +243,7 @@ interrupt-parent = <&gpio6>; interrupts = <10 IRQ_TYPE_EDGE_FALLING>; reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ @@ -22,7 +24,7 @@ index 26525e24a6c7..78a1011c1ea2 100644 }; pcap@10 { -@@ -170,6 +170,7 @@ +@@ -253,6 +253,7 @@ gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ >; @@ -30,3 +32,45 @@ index 26525e24a6c7..78a1011c1ea2 100644 }; /* M41T0M6 real time clock on carrier board */ +diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts +index c6ffe7477650..cfb6011d7b5c 100644 +--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts ++++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts +@@ -259,7 +259,7 @@ + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ +- status = "disabled"; ++ status = "okay"; + }; + + pcap@10 { +@@ -269,6 +269,7 @@ + gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ + &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ + >; ++ status = "disabled"; + }; + + /* M41T0M6 real time clock on carrier board */ +diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts +index 755ea18dcc14..d9947bff9bbe 100644 +--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts ++++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts +@@ -234,7 +234,7 @@ + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ +- status = "disabled"; ++ status = "okay"; + }; + + pcap@10 { +@@ -244,6 +244,7 @@ + gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ + &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ + >; ++ status = "disabled"; + }; + + eeprom@50 { diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.%.bbappend index 8760ee8a..1bff6da5 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.%.bbappend @@ -29,9 +29,6 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree" -# remove from imx8 kernel build -SRC_URI_remove = " file://Install-dma-buf-h.patch" - do_preconfigure_prepend () { # FunctionFS for qdbd echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.14%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.14%.bbappend new file mode 100644 index 00000000..e7acae73 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.14%.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2019 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$ +## +############################################################################ + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-Enable-atmel-mxt-multitouch-controller.patch" diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.9-2.3.x.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.9-2.3.x.bbappend deleted file mode 100644 index eadfa154..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_4.9-2.3.x.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 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$ -## -############################################################################ - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-Enable-atmel-mxt-multitouch-controller.patch" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index fb3acb7c..b37a3519 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -12,7 +12,6 @@ - - diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 132c6167..f03b4f11 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -66,10 +66,7 @@ if [ ! -e ${PWD}/${BUILDDIRECTORY} ]; then imx8*) LAYERSCONF="bblayers.conf.fsl-imx8.sample" ;; - apalis-imx8|colibri-imx8qxp) - LAYERSCONF="bblayers.conf.toradex-imx8.sample" - ;; - apalis-imx6|colibri-imx6|colibri-imx6ull|colibri-vf|colibri-imx7|colibri-imx7-emmc) + apalis-*|colibri-*) LAYERSCONF="bblayers.conf.toradex.sample" ;; nitrogen6x|nitrogen7|nitrogen8m|nitrogen8mm) -- cgit v1.2.3