From 2ad610490aeb8ac723f1a796aaad56aec3872574 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 15 Nov 2022 18:10:40 +0100 Subject: imx-gpu-viv: update from 6.4.3.p4.2 to 6.4.3.p4.4 Update to the version used in lf5.15.52_2.1.0. Note that the the vulkan installable client driver is provided with a filename and soname that no longer clashes with the vulkan loader. Thus the rename and soname magic is dropped. License was updated to NXP EULA v39 August 2022. Signed-off-by: Max Krummenacher --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 15 ++------------- .../imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb | 10 ---------- .../imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb | 10 ---------- .../imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb | 10 ++++++++++ .../imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb | 10 ++++++++++ 5 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 5c4b68cc..169606c2 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -6,7 +6,7 @@ DESCRIPTION = "GPU driver and apps for i.MX" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -177,9 +177,7 @@ IMX_SOC:mx8mq-nxp-bsp = "mx8mq" IMX_SOC:mx8mn-nxp-bsp = "mx8mn" IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" -LIBVULKAN_VERSION_MAJOR = "1" -LIBVULKAN_VERSION = "${LIBVULKAN_VERSION_MAJOR}.2.1" -LIBVULKAN_API_VERSION = "${LIBVULKAN_VERSION_MAJOR}.2.182" +LIBVULKAN_API_VERSION = "1.2.182" do_install () { install -d ${D}${libdir} @@ -258,15 +256,6 @@ do_install () { fi if [ "${IS_MX8}" = "1" ]; then - # Rename the vulkan implementation library which is wrapped by the vulkan-loader - # library of the same name - MAJOR=${LIBVULKAN_VERSION_MAJOR} - FULL=${LIBVULKAN_VERSION} - mv ${D}${libdir}/libvulkan.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL - patchelf --set-soname libvulkan_VSI.so.$MAJOR ${D}${libdir}/libvulkan_VSI.so.$FULL - rm ${D}${libdir}/libvulkan.so.$MAJOR ${D}${libdir}/libvulkan.so - ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR - ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so if [ -z "${PACKAGES_VULKAN}" ]; then set -f for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb deleted file mode 100644 index bb07fb10..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright 2017-2020 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "8e83cb642033ac3b85a5473b6d92687e" -SRC_URI[sha256sum] = "89197fdb13dfc21c49968297c2e8b5cb8dd5563502278151d36b2dce2a2092ed" - -COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb deleted file mode 100644 index 4136631b..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb +++ /dev/null @@ -1,10 +0,0 @@ -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "22de8a5f59a56a7ef499f590d1659b6f" -SRC_URI[sha256sum] = "52921c0b59529f1598084e991eda1863100754f28a7744ba958158dff8074b3b" - -INSANE_SKIP:append:libc-musl = " file-rdeps" - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" - -RDEPENDS:${PN}:append:libc-musl = " gcompat" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb new file mode 100644 index 00000000..2c7fbecc --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb @@ -0,0 +1,10 @@ +# Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2017-2020 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "5cf2085e4b9706e4c964ed7fdb57bfe3" +SRC_URI[sha256sum] = "5b9dd02cb2dfa564903872576cd6586fbf4a02abdb8e180978bd84205ab302a7" + +COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb new file mode 100644 index 00000000..531eb13c --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb @@ -0,0 +1,10 @@ +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "b899f9d4a179eab622880fd22ec7cb64" +SRC_URI[sha256sum] = "5c52bd15146c24d449638c6276c07103949c8efbc53d002518541bc37c57e424" + +INSANE_SKIP:append:libc-musl = " file-rdeps" + +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" + +RDEPENDS:${PN}:append:libc-musl = " gcompat" -- cgit v1.2.3-54-g00ecf From 97fae3422d575110346b5238a758d343376ef2d1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 15 Nov 2022 18:01:50 +0100 Subject: imx-gpu-g2d: update from 6.4.3.p4.2 to 6.4.3.p4.4 Update to the version used in lf5.15.52_2.1.0. License was updated to NXP EULA v39 August 2022. Signed-off-by: Max Krummenacher --- recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb | 33 ---------------------- recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb | 33 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb create mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb deleted file mode 100644 index 223fb955..00000000 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2022 NXP -# Copyright 2018 (C) O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "G2D library using i.MX GPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" -DEPENDS = "libgal-imx" -PROVIDES = "virtual/libg2d" - -FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" - -SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" -SRC_URI[aarch64.md5sum] = "bf2a4e45835863f0563760fc8a1b7d58" -SRC_URI[aarch64.sha256sum] = "ff50ddfee2d989798a2aba84ef9114e01f8d867293891dc0aacfab1640cbf8a3" -SRC_URI[arm.md5sum] = "45d0fce306a6e0c7237b27da7c787f26" -SRC_URI[arm.sha256sum] = "0ba9806c4efa0154fc9f7be406e42bc2c50b975abd32cbe322cf7bcf6ae0d350" - -S = "${WORKDIR}/${FSLBIN_NAME}" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} -} - -INSANE_SKIP:${PN} = "ldflags" - -COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb new file mode 100644 index 00000000..524f15e9 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb @@ -0,0 +1,33 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2022 NXP +# Copyright 2018 (C) O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "G2D library using i.MX GPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" +DEPENDS = "libgal-imx" +PROVIDES = "virtual/libg2d" + +FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" + +SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" +SRC_URI[aarch64.md5sum] = "98d46bca2ae66e31b7e4878a7b622b99" +SRC_URI[aarch64.sha256sum] = "8341d6e2cde3f3ffa035dc95b0487dd04a50531cc80f4cddc5a689ebc4946e02" +SRC_URI[arm.md5sum] = "ff96d069092424a50ba4542d6ef5e931" +SRC_URI[arm.sha256sum] = "7737a3372bcde34e2d275397df67c307df5033d5b133ac770f75cac4e1ec2580" + +S = "${WORKDIR}/${FSLBIN_NAME}" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} +} + +INSANE_SKIP:${PN} = "ldflags" + +COMPATIBLE_MACHINE = "(imxgpu2d)" -- cgit v1.2.3-54-g00ecf From d92613880280183d438f607ec3c74b549894cbe8 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 15 Nov 2022 18:27:02 +0100 Subject: imx-dpu-g2d: update from 2.1.0 to 2.1.2 Update to the version used in lf5.15.52_2.1.0. License was updated to NXP EULA v39 August 2022. Signed-off-by: Max Krummenacher --- recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb | 30 --------------------------- recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb | 30 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb deleted file mode 100644 index e2f5912b..00000000 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2022 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "G2D library using i.MX DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" - -DEPENDS = "libgal-imx libdrm" -PROVIDES += "virtual/libg2d" - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "fa60a480c8d98cee969aa520bc829bf4" -SRC_URI[sha256sum] = "65acc7345dcaf39536d60ee4516ad731c403790ed05d61a818601392554a6620" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} -} - -INSANE_SKIP:${PN} += "ldflags" -INSANE_SKIP:append:libc-musl = " file-rdeps" - -COMPATIBLE_MACHINE = "(imxdpu)" - -RDEPENDS:${PN}:append:libc-musl = " gcompat" diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb new file mode 100644 index 00000000..b3bcbdf1 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb @@ -0,0 +1,30 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2022 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "G2D library using i.MX DPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" + +DEPENDS = "libgal-imx libdrm" +PROVIDES += "virtual/libg2d" + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" +SRC_URI[md5sum] = "85daf26176695de80a024b5f67037f08" +SRC_URI[sha256sum] = "1023814d810c0a85c91cb2170c77f663f624331261ba0e1ab1ce29e8c192e1bc" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} +} + +INSANE_SKIP:${PN} += "ldflags" +INSANE_SKIP:append:libc-musl = " file-rdeps" + +COMPATIBLE_MACHINE = "(imxdpu)" + +RDEPENDS:${PN}:append:libc-musl = " gcompat" -- cgit v1.2.3-54-g00ecf From 5e6003bf5add83d67cd8f704d1512ebf5ee18b6f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 16 Nov 2022 18:15:35 +0100 Subject: imx-g2d-samples: update to 2.1, sha 5a38513 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to the version used in lf5.15.52_2.1.0. imx-g2d-samples now is configured with the BUILD_IMPLEMENTATION environment variable which is expected to be set to one of dpu|gpu-drm|gpu-fbdev depending on the targeted SoC. Commit history: * 5a38513 wayland_dmabuf_test:Convert to xdg-shell * c8167c1 wayland_cf_test:Convert to xdg-shell * 2ccdebe wayland_shm_test:Convert to xdg-shell * 82169b8 LF-6057: g2d_wayland_dmabuf_test had no display * 63272d5 Add multiblit_test build for imx6/7 fbdev * 85ef72a rename extended_test to tiling_test * 2fbe894 YOCIMX-6294: Configure samples to build by implementation * 4f03293 README.md: Cleanup minor issues * 0b6981e MGS-6648 [#ccc] Add Test loop parameter in command line for power measurements Signed-off-by: Max Krummenacher --- recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | 34 ++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 8368aefc..46bd3a55 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb @@ -10,15 +10,39 @@ PV = "2.1+git${SRCPV}" SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https" SRCBRANCH ?= "imx_2.1" -SRCREV = "3268f291a15b2d8d5f650f627764a52eb0a8fc15" +SRCREV = "5a38513b97ff83b46777cf73da3cbe37b4976498" S = "${WORKDIR}/git" inherit pkgconfig -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" - -PACKAGECONFIG[wayland] = "USE_WAYLAND=true,USE_WAYLAND=false,wayland-native wayland-protocols" +PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" +PACKAGECONFIG_IMPLEMENTATION = "" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" +PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" + +PACKAGECONFIG[dpu] = " \ + BUILD_IMPLEMENTATION=dpu, \ + , \ + imx-dpu-g2d wayland-native wayland-protocols, \ + , \ + , \ + gpu-drm gpu-fbdev" +PACKAGECONFIG[gpu-drm] = " \ + BUILD_IMPLEMENTATION=gpu-drm, \ + , \ + imx-gpu-g2d wayland-native wayland-protocols, \ + , \ + , \ + dpu gpu-fbdev" +PACKAGECONFIG[gpu-fbdev] = " \ + BUILD_IMPLEMENTATION=gpu-fbdev, \ + , \ + imx-gpu-g2d, \ + , \ + , \ + dpu gpu-drm" EXTRA_OEMAKE += " \ SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ @@ -31,4 +55,6 @@ do_install() { FILES:${PN} += "/opt" +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + COMPATIBLE_MACHINE = "(imxgpu2d)" -- cgit v1.2.3-54-g00ecf From 8114b55995e4e73c19dab6670adc8d7ec633f8af Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 15 Nov 2022 18:57:06 +0100 Subject: weston imx: update from 10.0.0.imx to 10.0.1.imx Update to the version used in lf5.15.52_2.1.0. Signed-off-by: Max Krummenacher --- conf/machine/include/imx-base.inc | 2 +- recipes-graphics/wayland/weston_10.0.0.imx.bb | 212 -------------------------- recipes-graphics/wayland/weston_10.0.1.imx.bb | 212 ++++++++++++++++++++++++++ 3 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 recipes-graphics/wayland/weston_10.0.0.imx.bb create mode 100644 recipes-graphics/wayland/weston_10.0.1.imx.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index e9b751e0..b32267ce 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -473,7 +473,7 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston:imx-nxp-bsp ??= "10.0.0.imx" +PREFERRED_VERSION_weston:imx-nxp-bsp ??= "10.0.1.imx" PREFERRED_VERSION_weston:imx-mainline-bsp = "" PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.25.imx" diff --git a/recipes-graphics/wayland/weston_10.0.0.imx.bb b/recipes-graphics/wayland/weston_10.0.0.imx.bb deleted file mode 100644 index effef386..00000000 --- a/recipes-graphics/wayland/weston_10.0.0.imx.bb +++ /dev/null @@ -1,212 +0,0 @@ -# This recipe is for the i.MX fork of weston. For ease of -# maintenance, the top section is a verbatim copy of an OE-core -# recipe. The second section customizes the recipe for i.MX. - -########### OE-core copy ################## -# Upstream hash: 400aae43d08f0b9f787ac0d21cb3c97058d76748 - -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ - " - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop \ - file://xwayland.weston-start \ - file://systemd-notify.weston-start \ - " - -SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " - -SRC_URI[sha256sum] = "5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit meson pkgconfig useradd - -# depends on virtual/egl -# -require ${THISDIR}/required-distro-features.inc - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" -DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" -DEPENDS:append:imxfbdev = " libdrm" - -LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" - -WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" - -EXTRA_OEMESON += "-Dpipewire=false" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ - ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ - image-jpeg \ - screenshare \ - shell-desktop \ - shell-fullscreen \ - shell-ivi" - -# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' -SIMPLECLIENTS ?= "all" - -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" -# Weston on X11 -PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" -# Headless Weston -PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" -# Weston on framebuffer -PACKAGECONFIG[fbdev] = "-Ddeprecated-backend-fbdev=true,-Ddeprecated-backend-fbdev=false,udev mtdev" -# Weston on RDP -PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" -# weston-launch -PACKAGECONFIG[launch] = "-Ddeprecated-weston-launch=true,-Ddeprecated-weston-launch=false,drm" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" -# Weston with lcms support -PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" -# Weston with systemd-login support -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" -# Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" -# colord CMS support -PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" -# Clients support -PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" -# Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" -# Weston with screen-share support -PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" -# Traditional desktop shell -PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" -# Fullscreen shell -PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" -# In-Vehicle Infotainment (IVI) shell -PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" -# JPEG image loading support -PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" -# support libseat based launch -PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" - -do_install:append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then - chmod u+s ${D}${bindir}/weston-launch - fi -} - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ - libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" - -FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" -FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" - -FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" -SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." - -FILES:${PN}-examples = "${bindir}/*" - -FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS:${PN}-xwayland += "xwayland" - -RDEPENDS:${PN} += "xkeyboard-config" -RRECOMMENDS:${PN} = "weston-init liberation-fonts" -RRECOMMENDS:${PN}-dev += "wayland-protocols" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system weston-launch" - -########### End of OE-core copy ########### - -########### i.MX overrides ################ - -SUMMARY = "Weston, a Wayland compositor, i.MX fork" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI:prepend = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " -SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ - file://0001-g2d-renderer.c-Include-sys-stat.h.patch \ - file://0001-tests-Add-dependency-on-screenshooter-client-protoco.patch \ - " -SRCBRANCH = "weston-imx-10.0" -SRCREV = "c8c6e3106b03441db1037afa995f95fcb2f9f17d" - -S = "${WORKDIR}/git" - -# Disable OpenGL for parts with GPU support for 2D but not 3D -REQUIRED_DISTRO_FEATURES = "opengl" -REQUIRED_DISTRO_FEATURES:imxgpu2d = "" -REQUIRED_DISTRO_FEATURES:imxgpu3d = "opengl" -PACKAGECONFIG_OPENGL = "opengl" -PACKAGECONFIG_OPENGL:imxgpu2d = "" -PACKAGECONFIG_OPENGL:imxgpu3d = "opengl" - -PACKAGECONFIG:remove = "wayland x11" -PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}" - -PACKAGECONFIG:remove:imxfbdev = "kms" -PACKAGECONFIG:append:imxfbdev = " fbdev clients" -PACKAGECONFIG:append:imxgpu = " imxgpu" -PACKAGECONFIG:append:imxgpu2d = " imxg2d" - -SIMPLECLIENTS:imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" - -# Override -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" -# Weston with i.MX GPU support -PACKAGECONFIG[imxgpu] = "-Dimxgpu=true,-Dimxgpu=false,virtual/egl" -# Weston with i.MX G2D renderer -PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" -# Weston with OpenGL support -PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false" - -PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" -EXTRA_OEMESON:append:imxfbdev = " -Dbackend-default=fbdev" - -EXTRA_OEMESON += "-Ddeprecated-wl-shell=true" - -# links with imx-gpu libs which are pre-built for glibc -# gcompat will address it during runtime -LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" - -########### End of i.MX overrides ######### diff --git a/recipes-graphics/wayland/weston_10.0.1.imx.bb b/recipes-graphics/wayland/weston_10.0.1.imx.bb new file mode 100644 index 00000000..84cd9fd8 --- /dev/null +++ b/recipes-graphics/wayland/weston_10.0.1.imx.bb @@ -0,0 +1,212 @@ +# This recipe is for the i.MX fork of weston. For ease of +# maintenance, the top section is a verbatim copy of an OE-core +# recipe. The second section customizes the recipe for i.MX. + +########### OE-core copy ################## +# Upstream hash: 400aae43d08f0b9f787ac0d21cb3c97058d76748 + +SUMMARY = "Weston, a Wayland compositor" +DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ + file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ + " + +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://weston.png \ + file://weston.desktop \ + file://xwayland.weston-start \ + file://systemd-notify.weston-start \ + " + +SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " + +SRC_URI[sha256sum] = "5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +inherit meson pkgconfig useradd + +# depends on virtual/egl +# +require ${THISDIR}/required-distro-features.inc + +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" +DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" +DEPENDS:append:imxfbdev = " libdrm" + +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" + +WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" + +EXTRA_OEMESON += "-Dpipewire=false" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ + ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ + image-jpeg \ + screenshare \ + shell-desktop \ + shell-fullscreen \ + shell-ivi" + +# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' +SIMPLECLIENTS ?= "all" + +# +# Compositor choices +# +# Weston on KMS +PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev" +# Weston on Wayland (nested Weston) +PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" +# Weston on X11 +PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" +# Headless Weston +PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" +# Weston on framebuffer +PACKAGECONFIG[fbdev] = "-Ddeprecated-backend-fbdev=true,-Ddeprecated-backend-fbdev=false,udev mtdev" +# Weston on RDP +PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" +# weston-launch +PACKAGECONFIG[launch] = "-Ddeprecated-weston-launch=true,-Ddeprecated-weston-launch=false,drm" +# VA-API desktop recorder +PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" +# Weston with EGL support +PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" +# Weston with lcms support +PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" +# Weston with webp support +PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" +# Weston with systemd-login support +PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" +# Weston with Xwayland support (requires X11 and Wayland) +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" +# colord CMS support +PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" +# Clients support +PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" +# Virtual remote output with GStreamer on DRM backend +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" +# Weston with screen-share support +PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" +# Traditional desktop shell +PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" +# Fullscreen shell +PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" +# In-Vehicle Infotainment (IVI) shell +PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" +# JPEG image loading support +PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" +# support libseat based launch +PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" + +do_install:append() { + # Weston doesn't need the .la files to load modules, so wipe them + rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la + + # If X11, ship a desktop file to launch it + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then + install -d ${D}${datadir}/applications + install ${WORKDIR}/weston.desktop ${D}${datadir}/applications + + install -d ${D}${datadir}/icons/hicolor/48x48/apps + install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then + chmod u+s ${D}${bindir}/weston-launch + fi +} + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ + libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" + +FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" +FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" + +FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" +SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." + +FILES:${PN}-examples = "${bindir}/*" + +FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" +RDEPENDS:${PN}-xwayland += "xwayland" + +RDEPENDS:${PN} += "xkeyboard-config" +RRECOMMENDS:${PN} = "weston-init liberation-fonts" +RRECOMMENDS:${PN}-dev += "wayland-protocols" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system weston-launch" + +########### End of OE-core copy ########### + +########### i.MX overrides ################ + +SUMMARY = "Weston, a Wayland compositor, i.MX fork" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " +SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ + file://0001-g2d-renderer.c-Include-sys-stat.h.patch \ + file://0001-tests-Add-dependency-on-screenshooter-client-protoco.patch \ + " +SRCBRANCH = "weston-imx-10.0.1" +SRCREV = "3f8f336b5d2cf7ea7aa4e047d669d093fc46dfe6" + +S = "${WORKDIR}/git" + +# Disable OpenGL for parts with GPU support for 2D but not 3D +REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES:imxgpu2d = "" +REQUIRED_DISTRO_FEATURES:imxgpu3d = "opengl" +PACKAGECONFIG_OPENGL = "opengl" +PACKAGECONFIG_OPENGL:imxgpu2d = "" +PACKAGECONFIG_OPENGL:imxgpu3d = "opengl" + +PACKAGECONFIG:remove = "wayland x11" +PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}" + +PACKAGECONFIG:remove:imxfbdev = "kms" +PACKAGECONFIG:append:imxfbdev = " fbdev clients" +PACKAGECONFIG:append:imxgpu = " imxgpu" +PACKAGECONFIG:append:imxgpu2d = " imxg2d" + +SIMPLECLIENTS:imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" + +# Override +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" +# Weston with i.MX GPU support +PACKAGECONFIG[imxgpu] = "-Dimxgpu=true,-Dimxgpu=false,virtual/egl" +# Weston with i.MX G2D renderer +PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" +# Weston with OpenGL support +PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false" + +PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" +EXTRA_OEMESON:append:imxfbdev = " -Dbackend-default=fbdev" + +EXTRA_OEMESON += "-Ddeprecated-wl-shell=true" + +# links with imx-gpu libs which are pre-built for glibc +# gcompat will address it during runtime +LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" + +########### End of i.MX overrides ######### -- cgit v1.2.3-54-g00ecf