diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-12-05 07:17:32 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-12-07 08:05:34 +0000 |
| commit | 422be4a1f443fd91d425def842f3bce2aff2816b (patch) | |
| tree | 30073c602f1a01fd98fb1b862ac4e4867a5b6af7 | |
| parent | 71965bf0be964b0ce8a55d68c7459049026aa596 (diff) | |
nxp: don't force NXP BSP
Use IMX_DEFAULT_BSP as it's defined in the upstream layers for each machine
instead of forcing NXP BSP. Toradex imx6 only supports mainline kernel,
so we cannot use NXP BSP or kernel there anymore.
With mainline BSP, the overrides are also different, make sure the features
needing GPU are removed correctly from imx6ull and imx7 boards.
Change-Id: Ife7808219631834d5d11b30df8c3cc62eb6abbfd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 04bbfa85cddd04005ddb77af0d84606bc7c7cf69)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt-distro/conf/distro/include/fsl.inc | 8 | ||||
| -rw-r--r-- | meta-boot2qt-distro/conf/distro/include/toradex.inc | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc index b922515f..b4980f45 100644 --- a/meta-boot2qt-distro/conf/distro/include/fsl.inc +++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc @@ -41,10 +41,6 @@ DEPLOY_CONF_NAME:imx8qpx-mek = "NXP i.MX 8QuadXPlus MEK" IMAGE_FSTYPES += "wic.xz" -IMX_DEFAULT_BSP = "nxp" -IMX_DEFAULT_BOOTLOADER ?= "u-boot-imx" -IMX_DEFAULT_KERNEL:b2qt = "linux-imx" - DEPLOY_CONF_IMAGE_TYPE = "wic.xz" QBSP_IMAGE_CONTENT += "\ @@ -65,3 +61,7 @@ PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.20.0" PREFERRED_VERSION_gstreamer1.0-rtsp-server:use-nxp-bsp ?= "1.20.0" MACHINE_GSTREAMER_1_0_PLUGIN:append:imxgpu = " imx-gst1.0-plugin" + +GPULESS_FEATURES = "wayland opengl vulkan webengine" +DISTRO_FEATURES:remove:mx6ul-generic-bsp = "${GPULESS_FEATURES}" +DISTRO_FEATURES:remove:mx7-generic-bsp = "${GPULESS_FEATURES}" diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index a7dd0504..61f1e354 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -32,8 +32,6 @@ include conf/distro/include/fsl.inc # include file from meta-toradex-nxp include conf/machine/include/${MACHINE}.inc -PREFERRED_PROVIDER_virtual/dtb:use-nxp-bsp = "device-tree-overlays" - IMAGE_CLASSES += "image_type_tezi_b2qt" QBSP_IMAGE_CONTENT += "\ @@ -57,10 +55,6 @@ DEPLOY_CONF_NAME:colibri-imx8x = "Toradex Colibri iMX8X" DEPLOY_CONF_NAME:verdin-imx8mm = "Toradex Verdin iMX8M Mini" DEPLOY_CONF_NAME:verdin-imx8mp = "Toradex Verdin iMX8M Plus" -GPULESS_FEATURES = "wayland opengl vulkan webengine" -GPULESS_FEATURES:imxgpu = "" -DISTRO_FEATURES:remove = "${GPULESS_FEATURES}" - # Suitable DRI device DRI_DEVICE:apalis-imx6 = "card1" DRI_DEVICE:colibri-imx6 = "card1" |