aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-09-04 13:56:29 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2020-11-12 12:59:43 +0300
commit98182fb6069d58bd9d66a49339e1033ce82ad649 (patch)
treea9c0796ef4aaf90bf26d1eec544923b54424f35c
parent1bb9374345f73fe52fbac399ac3403a1d95e3a78 (diff)
Remove BoundaryDevice board configurations
The BoundaryDevice support for Boot2Qt is moved to meta-boundary. Change-Id: I4e2fdb4790b4b3c568b1ddfdff12afc556ef9ce0 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt-distro/conf/bblayers.conf.boundary.sample53
-rw-r--r--meta-boot2qt-distro/conf/distro/include/boundary.inc40
-rw-r--r--meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf87
-rw-r--r--meta-boot2qt-distro/conf/distro/include/nitrogen7.conf34
-rw-r--r--meta-boot2qt-distro/conf/distro/include/nitrogen8m.conf32
-rw-r--r--meta-boot2qt-distro/conf/distro/include/nitrogen8mm.conf32
-rw-r--r--meta-boot2qt-distro/conf/layer.conf2
-rw-r--r--meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend32
-rw-r--r--meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt80
-rw-r--r--meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch23
-rw-r--r--meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary_%.bbappend33
-rw-r--r--meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-kernel/linux/linux-boundary_4.%.bbappend35
-rw-r--r--meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend30
-rw-r--r--meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme/nitrogen6x/README69
-rw-r--r--scripts/manifest.xml7
-rwxr-xr-xscripts/setup-environment.sh3
16 files changed, 0 insertions, 592 deletions
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
deleted file mode 100644
index 49bec1fc..00000000
--- a/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
+++ /dev/null
@@ -1,53 +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$
-##
-############################################################################
-
-# 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-boundary \
- ${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-qt6 \
- "
diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
deleted file mode 100644
index c7d5830a..00000000
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-############################################################################
-##
-## 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.inc
-
-BBMASK += " \
- meta-boundary/recipes-boundary/images \
- meta-boundary/recipes-graphics/mesa/mesa_%.bbappend \
- "
-
-MACHINE_EXTRA_INSTALL += "\
- kernel-module-qcacld \
- linux-firmware-bdsdmac \
- "
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
deleted file mode 100644
index 7883ab57..00000000
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
+++ /dev/null
@@ -1,87 +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$
-##
-############################################################################
-
-include conf/distro/include/boundary.inc
-
-DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
-
-BOOT_SPACE = "16384"
-IMAGE_BOOT_FILES += "\
- upgrade.scr-${MACHINE};upgrade.scr \
- upgrade.scr-${MACHINE};6x_upgrade \
- u-boot-${MACHINE}.imx-nit6xlite;u-boot.nit6xlite \
- u-boot-${MACHINE}.imx-nit6xlite1g;u-boot.nit6xlite1g \
- u-boot-${MACHINE}.imx-nitrogen6dl;u-boot.nitrogen6dl \
- u-boot-${MACHINE}.imx-nitrogen6dl2g;u-boot.nitrogen6dl2g \
- u-boot-${MACHINE}.imx-nitrogen6q2g;u-boot.nitrogen6q2g \
- u-boot-${MACHINE}.imx-nitrogen6q;u-boot.nitrogen6q \
- u-boot-${MACHINE}.imx-nitrogen6q_fl;u-boot.nitrogen6q_fl \
- u-boot-${MACHINE}.imx-nitrogen6qp_max;u-boot.nitrogen6qp_max \
- u-boot-${MACHINE}.imx-nitrogen6s1g;u-boot.nitrogen6s1g \
- u-boot-${MACHINE}.imx-nitrogen6s;u-boot.nitrogen6s \
- u-boot-${MACHINE}.imx-nitrogen6sx;u-boot.nitrogen6sx \
- u-boot-${MACHINE}.imx-nitrogen6_lum_dl1;u-boot.nitrogen6_lum_dl1 \
- u-boot-${MACHINE}.imx-nitrogen6_max;u-boot.nitrogen6_max \
- u-boot-${MACHINE}.imx-nitrogen6_vm1g;u-boot.nitrogen6_vm1g \
- u-boot-${MACHINE}.imx-nitrogen6_vm;u-boot.nitrogen6_vm \
- "
-WKS_FILE_DEPENDS += "u-boot"
-
-UBOOT_MACHINE = ""
-UBOOT_CONFIG ??= "nit6xlite nit6xlite1g \
- nitrogen6dl nitrogen6dl2g \
- nitrogen6q2g nitrogen6q nitrogen6q_fl nitrogen6qp_max \
- nitrogen6s1g nitrogen6s nitrogen6sx \
- nitrogen6_lum_dl1 nitrogen6_max \
- nitrogen6_vm1g nitrogen6_vm \
- "
-
-UBOOT_CONFIG[nit6xlite] = "nit6xlite_config"
-UBOOT_CONFIG[nit6xlite1g] = "nit6xlite1g_config"
-UBOOT_CONFIG[nitrogen6dl] = "nitrogen6dl_config"
-UBOOT_CONFIG[nitrogen6dl2g] = "nitrogen6dl2g_config"
-UBOOT_CONFIG[nitrogen6q2g] = "nitrogen6q2g_config"
-UBOOT_CONFIG[nitrogen6q] = "nitrogen6q_config"
-UBOOT_CONFIG[nitrogen6q_fl] = "nitrogen6q_fl_config"
-UBOOT_CONFIG[nitrogen6qp_max] = "nitrogen6qp_max_config"
-UBOOT_CONFIG[nitrogen6s1g] = "nitrogen6s1g_config"
-UBOOT_CONFIG[nitrogen6s] = "nitrogen6s_config"
-UBOOT_CONFIG[nitrogen6sx] = "nitrogen6sx_config"
-UBOOT_CONFIG[nitrogen6_lum_dl1] = "nitrogen6_lum_dl1_config"
-UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config"
-UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config"
-UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
-
-KERNEL_DEVICETREE += "\
- imx6dl-nit6xlite.dtb \
- "
-
-MACHINE_EXTRA_INSTALL += "\
- bcm4330-nvram-config \
- "
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
deleted file mode 100644
index a28efe91..00000000
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
+++ /dev/null
@@ -1,34 +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$
-##
-############################################################################
-
-include conf/distro/include/boundary.inc
-
-DEPLOY_CONF_NAME = "Boundary Devices i.MX7"
-
-DISTRO_FEATURES_remove = "webengine wayland vulkan opengl"
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen8m.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen8m.conf
deleted file mode 100644
index 9d3cfb27..00000000
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen8m.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/boundary.inc
-
-DEPLOY_CONF_NAME = "Boundary Devices i.MX8MQ"
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen8mm.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen8mm.conf
deleted file mode 100644
index c5f81368..00000000
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen8mm.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/boundary.inc
-
-DEPLOY_CONF_NAME = "Boundary Devices i.MX8MM"
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf
index 30b5fa93..a12c884d 100644
--- a/meta-boot2qt-distro/conf/layer.conf
+++ b/meta-boot2qt-distro/conf/layer.conf
@@ -43,8 +43,6 @@ LAYERSERIES_COMPAT_b2qt-distro = "dunfell"
# recipe appends for machine specific BSP layers
BBFILES_DYNAMIC += " \
- boundary-layer:${LAYERDIR}/dynamic-layers/boundary-layer/recipes*/*/*.bb \
- boundary-layer:${LAYERDIR}/dynamic-layers/boundary-layer/recipes*/*/*.bbappend \
freescale-layer:${LAYERDIR}/dynamic-layers/freescale-layer/recipes*/*/*.bb \
freescale-layer:${LAYERDIR}/dynamic-layers/freescale-layer/recipes*/*/*.bbappend \
intel:${LAYERDIR}/dynamic-layers/intel/recipes*/*/*.bb \
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend
deleted file mode 100644
index 068b9fa9..00000000
--- a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend
+++ /dev/null
@@ -1,32 +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$
-##
-############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}:"
-
-COMPATIBLE_MACHINE = "(cubox-i|nitrogen6x|nitrogen6x-lite|wandboard|imx6sl-warp)"
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt
deleted file mode 100644
index 6183cca2..00000000
--- a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Board configuration for Boundary Devices Nitrogen6-Lite
-#
-manfid=0x2d0
-prodid=0x0547
-vendid=0x14e4
-devid=0x4360
-boardtype=0x05e1
-boardrev=0x1202
-boardflags=0x0080200
-nocrc=1
-xtalfreq=37400
-boardnum=22
-ag0=254
-aa2g=1
-ccode=ALL
-pa0itssit=0x20
-pa0b0=5367
-pa0b1=-633
-pa0b2=-158
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-#rssi params for 5GHz
-rssismf5g=0x4
-rssismc5g=0x3
-rssisav5g=0x7
-#PA parameters for lower a-band
-pa1lob0=4378
-pa1lob1=-596
-pa1lob2=-180
-#PA parameters for midband
-pa1b0=4672
-pa1b1=-603
-pa1b2=-172
-#PA parameters for high band
-pa1hib0=4752
-pa1hib1=-609
-pa1hib2=-173
-rxpo5g=0
-maxp2ga0=76
-maxp5ga0=0x42
-maxp5gla0=0x42
-maxp5gha0=0x42
-# 2.4G Tx Power offsets
-cck2gpo=0x4444
-ofdm2gpo=0x66666666
-mcs2gpo0=0x8888
-mcs2gpo1=0x8888
-# 5G Tx Power offsets
-ofdm5gpo=0x44444444
-ofdm5glpo=0x44444444
-ofdm5ghpo=0x44444444
-mcs5gpo0=0x6666
-mcs5gpo1=0x6666
-mcs5glpo0=0x6666
-mcs5glpo1=0x6666
-mcs5ghpo0=0x6666
-mcs5ghpo1=0x46666
-sromrev=3
-# il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-cckPwrOffset=4
-swctrlmap_2g=0x44844484,0x42824282,0x40804484,0x18282,0x1ff
-triso5g=0
-swctrlmap_5g=0x00100010,0x20202020,0x20202020,0x14202,0x0f0
-rfreg033=0x19
-rfreg033_cck=0x1f
-dacrate2g=160
-dacrate5g=160
-txalpfbyp2g=1
-bphyscale=17
-cckPwrIdxCorr=-15
-pacalidx2g=50
-#pacalidx5g=20
-noise_cal_ref_2g=53
-noise_cal_po_2g=0
-noise_cal_ref_5g=52
-noise_cal_po_5g=5,0,0
-
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
deleted file mode 100644
index 80ab7024..00000000
--- a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bb26b06445338b798553f91f56b7433816c34ff2 Mon Sep 17 00:00:00 2001
-From: Mikko Gronoff <mikko.gronoff@qt.io>
-Date: Sun, 23 Apr 2017 21:47:01 +0300
-Subject: [PATCH] set CMA reserved size to 384MB
-
-Increased from 256MB (the default) to 384MB. Without this, HW-accelerated
-video decoding cannot work for high resolution videos.
----
- include/configs/nitrogen6x.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
-index 0dee736c8a..f49a01ef61 100644
---- a/include/configs/nitrogen6x.h
-+++ b/include/configs/nitrogen6x.h
-@@ -26,6 +26,7 @@
- #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-
- #define BD_I2C_MASK 7
-+#define BD_CMA "384M"
- #ifndef CONFIG_EXTRA_ENV_SETTINGS_DEFCONFIG
- #define CONFIG_EXTRA_ENV_SETTINGS_DEFCONFIG
- #endif
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary_%.bbappend b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary_%.bbappend
deleted file mode 100644
index 5f8c379c..00000000
--- a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-bsp/u-boot/u-boot-boundary_%.bbappend
+++ /dev/null
@@ -1,33 +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_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
- file://0002-set-CMA-reserved-size-to-384MB.patch \
- "
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-kernel/linux/linux-boundary_4.%.bbappend b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-kernel/linux/linux-boundary_4.%.bbappend
deleted file mode 100644
index 7e936173..00000000
--- a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-kernel/linux/linux-boundary_4.%.bbappend
+++ /dev/null
@@ -1,35 +0,0 @@
-############################################################################
-##
-## 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$
-##
-############################################################################
-
-# kernel image files are not needed in the image
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
-
-do_preconfigure_prepend() {
- echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig
-}
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend
deleted file mode 100644
index 64d9670e..00000000
--- a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend
+++ /dev/null
@@ -1,30 +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$
-##
-############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme/nitrogen6x/README b/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme/nitrogen6x/README
deleted file mode 100644
index 70639d52..00000000
--- a/meta-boot2qt-distro/dynamic-layers/boundary-layer/recipes-qt/boot2qt-addons/qbsp-readme/nitrogen6x/README
+++ /dev/null
@@ -1,69 +0,0 @@
-To successfully set up the Boot to Qt software stack,
-follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
-
-In Boundary Devices i.MX6 Board target devices, see also the U-Boot and
-Nitrogen6_Lite device specific instructions:
-
-
-2. Installing QBSP on Host Platform
-
-After you have flashed the device with Flashing Wizard, you may need to update U-Boot:
-
-* If you are updating your Boundary Devices i.MX6 Board from an older image,
-update the U-Boot version on the device. See 2.1 Updating U-Boot.
-* If your target device is Nitrogen6_Lite Device, see 1.2 Setup for Nitrogen6_Lite Device.
-
-Note: Sometimes U-Boot fails to select a suitable display for your target device
-and sets an incorrect display resolution.
-https://doc.qt.io/QtForDeviceCreation/qtee-customization.html#configuring-display-resolution
-instructs how you can configure the display and resolution used in your target device.
-
-
-2.1 Updating U-Boot
-
-If you are updating from an older image, you may also need to update the version
-of U-Boot on the device.
-
-The prebuilt image already contains U-Boot versions for most of the device variants
-from Boundary Devices, but the update needs to be done manually when first starting
-the device. Correct device type is selected by setting the uboot_defconfig
-U-Boot environment variable.
-
-More information available from https://boundarydevices.com/compiling-latest-u-boot-for-i-mx6-2015-edition/.
-
-Access the device's console and run the following commands on the U-Boot prompt:
-
-setenv uboot_defconfig <device type>
-setenv devnum 1 # or 0, if using SD slot
-setenv devtype mmc
-run upgradeu
-
-Reset or power cycle the device to start the new U-Boot. To reset the U-Boot
-environment to new default values, enter the following commands in the U-Boot
-command line:
-
-env default -a
-saveenv
-
-
-2.2 Setup for Nitrogen6_Lite Device
-
-The boot script requires the environment variables, dtbname and gpumem, to identify
-the device as Nitrogen6_Lite. Otherwise, the device is booted with the default
-GPU memory setting of 512MiB, which is more than what is available on the
-Nitrogen_Lite devices (128MibB).
-
-Use one of the two following options to enable the scripts boot the device with
-correct GPU memory setting:
-
-* Write a uEnv.txt file on to the boot partition of SD card with the following content:
-
-gpumem=67108864
-dtbname=imx6dl-nit6xlite.dtb
-
-* Access the device's console and run the following commands on the U-Boot prompt:
-
-U-Boot > setenv gpumem 67108864
-U-Boot > setenv dtbname imx6dl-nit6xlite.dtb
-U-Boot > saveenv
-
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index b7062a5a..8ba38125 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -87,11 +87,4 @@
revision="fddb6cc10a1df717cc77b6958ce5e233cef9a80a"
path="sources/meta-toradex-nxp"/>
- <!-- BoundaryDevices -->
- <remote name="boundary"
- fetch="git://github.com/boundarydevices"/>
- <project name="meta-boundary"
- remote="boundary"
- revision="317c4f037b8b82811be56a271266fb31cdd1fc7a"
- path="sources/meta-boundary"/>
</manifest>
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 77154128..31dfcc67 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -59,9 +59,6 @@ if [ ! -e ${PWD}/${BUILDDIRECTORY} ]; then
apalis-*|colibri-*)
LAYERSCONF="bblayers.conf.toradex.sample"
;;
- nitrogen*)
- LAYERSCONF="bblayers.conf.boundary.sample"
- ;;
imx*)
LAYERSCONF="bblayers.conf.fsl.sample"
;;