37 files changed, 588 insertions, 2900 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index a3c8af2c..e57c3b59 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "freescale-layer"
 BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_freescale-layer = "5"
-LAYERSERIES_COMPAT_freescale-layer = "kirkstone"
+LAYERSERIES_COMPAT_freescale-layer = "kirkstone langdale"
 # Add the Freescale-specific licenses into the metadata
 LICENSE_PATH += "${LAYERDIR}/custom-licenses"
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 16a061e5..b7b44589 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -34,7 +34,7 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 ### u-boot-fslc settings ###
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 ### u-boot-imx settings ###
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 62ad478e..7c40a860 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -43,7 +43,7 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 ### u-boot-fslc settings ###
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 ### u-boot-imx settings ###
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index f1257c24..a0d6be13 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -187,15 +187,15 @@ MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxf
 MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp     = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp"
-MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8dxl-generic-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-nxp-bsp"
 #######
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index 03e09e57..794a0bad 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -12,6 +12,8 @@ SRC_URI:append:imxgpu2d += " \
        file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
        file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
        file://0003-i.MX6-force-egl-visual-ID-33.patch \
+        file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \
+        file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch.patch \
 "
 DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2"
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch
new file mode 100644
index 00000000..7eee7cf2
--- /dev/null
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch
@@ -0,0 +1,25 @@
+From 234580de9d63fd79a8b444358cdaeac111a17061 Mon Sep 17 00:00:00 2001
+From: Mauro Salvini <m.salvini@koansoftware.com>
+Date: Thu, 29 Sep 2022 16:06:04 +0200
+Subject: [PATCH 1/2] config.tests: add DEFINES to compile egl test with
+ imxgpu2d (Vivante)
+Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com>
+---
+ config.tests/unix/egl/egl.pro | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/config.tests/unix/egl/egl.pro b/config.tests/unix/egl/egl.pro
+index f04d0535..bc35b908 100644
+--- a/config.tests/unix/egl/egl.pro
+++ b/config.tests/unix/egl/egl.pro
+@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) {
+ 
+ !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
+ !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
+DEFINES += LINUX=1 EGL_API_FB=1
+ 
+ CONFIG -= qt
+-- 
+2.17.1
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch
new file mode 100644
index 00000000..993df85e
--- /dev/null
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch
@@ -0,0 +1,25 @@
+From adb19c68d3c92eb1a88e49e447ce827f14943486 Mon Sep 17 00:00:00 2001
+From: Mauro Salvini <m.salvini@koansoftware.com>
+Date: Thu, 29 Sep 2022 16:12:11 +0200
+Subject: [PATCH 2/2] config.tests: add DEFINES to compile egl4gles1 test with
+ imxgpu2d (Vivante)
+Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com>
+---
+ config.tests/unix/egl4gles1/egl4gles1.pro | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/config.tests/unix/egl4gles1/egl4gles1.pro b/config.tests/unix/egl4gles1/egl4gles1.pro
+index 667ea8e3..14cb4a76 100644
+--- a/config.tests/unix/egl4gles1/egl4gles1.pro
+++ b/config.tests/unix/egl4gles1/egl4gles1.pro
+@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) {
+ 
+ !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
+ !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
+DEFINES += LINUX=1 EGL_API_FB=1
+ 
+ CONFIG -= qt
+-- 
+2.17.1
diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend
index 245adb59..c61e9a58 100644
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -3,6 +3,6 @@ PACKAGECONFIG:remove:imxgpu3d = "opengl"
 # links with imx-gpu libs which are pre-built for glibc
 # gcompat will address it during runtime
-LDFLAGS:append:imxgpu3d:libc-musl = " -Wl,--allow-shlib-undefined"
 LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
+RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat"
diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend
index 2f108a27..6bc01807 100644
--- a/recipes-graphics/gtk+/gtk+3_%.bbappend
+++ b/recipes-graphics/gtk+/gtk+3_%.bbappend
@@ -1,5 +1 @@
 DEPENDS:append:imxgpu2d = " virtual/egl"
-PACKAGECONFIG:remove:imxgpu2d = " \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "x11", "", d)} \
-"
diff --git a/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
new file mode 100644
index 00000000..bf8c38fc
--- /dev/null
+++ b/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
@@ -0,0 +1,5 @@
+# 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"
+RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat"
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
index ad8de74c..e2f5912b 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb
@@ -23,5 +23,8 @@ do_install () {
 }
 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-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 4abab088..4cbb7ba6 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -25,6 +25,8 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
 # We depend on mesa to fill in what is missing.
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
+DEPENDS:append:libc-musl = " gcompat"
 PROVIDES += " \
    imx-gpu-viv \
    libgal-imx \
@@ -48,9 +50,14 @@ EXTRA_PROVIDES:append:imxgpu3d = " \
 EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
    virtual/libgbm \
 "
 PROVIDES_OPENGLES3               = ""
 PROVIDES_OPENGLES3:mx8-nxp-bsp   = "virtual/libgles3"
 PROVIDES_OPENGLES3:mx8mm-nxp-bsp = ""
+# Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus.
+# However, only limited support is provided on other i.MX 8 machines
+# as needed for i.MX machine learning packages.
 PROVIDES_OPENVX                  = ""
 PROVIDES_OPENVX:mx8-nxp-bsp      = "virtual/libopenvx"
 PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
@@ -59,9 +66,7 @@ RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
 PE = "1"
-inherit fsl-eula-unpack features_check
+inherit fsl-eula-unpack
-REQUIRED_DISTRO_FEATURES:mx8-nxp-bsp = "wayland"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
@@ -71,27 +76,39 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[valgrind] = ""
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-IMX_PACKAGES_GBM     = ""
+PACKAGES =+ " \
-IMX_PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
-PACKAGES =+ "libclc-imx libclc-imx-dev \
        libgl-imx libgl-imx-dev \
        libgles1-imx libgles1-imx-dev \
        libgles2-imx libgles2-imx-dev \
        libgles3-imx-dev \
        libglslc-imx libglslc-imx-dev \
-        libopencl-imx libopencl-imx-dev \
+        ${PACKAGES_OPENCL} \
        libopenvg-imx libopenvg-imx-dev \
        libvdk-imx libvdk-imx-dev \
        libegl-imx libegl-imx-dev \
        libgal-imx libgal-imx-dev \
        libvsc-imx \
-        ${IMX_PACKAGES_GBM} \
+        ${PACKAGES_GBM} \
        imx-gpu-viv-tools \
        imx-gpu-viv-demos \
-        libvulkan-imx libvulkan-imx-dev \
+        ${PACKAGES_VULKAN} \
-        libopenvx-imx libopenvx-imx-dev \
+        ${PACKAGES_OPENVX} \
        libnn-imx \
 "
+PACKAGES_GBM                  = ""
+PACKAGES_GBM:mx8-nxp-bsp      = "libgbm-imx libgbm-imx-dev"
+PACKAGES_OPENCL               = "libopencl-imx libopencl-imx-dev libclc-imx libclc-imx-dev"
+PACKAGES_OPENCL:mx7-nxp-bsp   = ""
+PACKAGES_OPENVX = \
+    "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \
+        "libopenvx-imx libopenvx-imx-dev", "", d)}"
+PACKAGES_VULKAN               = ""
+PACKAGES_VULKAN:imxvulkan     = "libvulkan-imx libvulkan-imx-dev"
 python __anonymous () {
        has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0')
        if has_vivante_kernel_driver_support != '1':
@@ -175,6 +192,7 @@ do_install () {
    # Use vulkan header from vulkan-headers recipe to support vkmark
    rm -rf ${D}${includedir}/vulkan/
+    # Install SOC-specific drivers
    if [ -d ${S}/gpu-core/usr/lib/${IMX_SOC} ]; then
        cp -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir}
    fi
@@ -184,28 +202,59 @@ do_install () {
        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
    fi
+    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc    ${D}${libdir}/pkgconfig/glesv2.pc
+    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc        ${D}${libdir}/pkgconfig/vg.pc
+    # Install backend-specific drivers
    if [ "${BACKEND}" = "wayland" ]; then
+        # Wayland backend
        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+        cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
+    elif [ "${IS_MX8}" != "1" ]; then
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
+        # Framebuffer backend for i.MX 6 and 7
-    else
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
+        cp -r ${S}/gpu-core/usr/lib/fb/* ${D}${libdir}
+    else
+        # Framebuffer backend for i.MX 8 and beyond
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl.pc         ${D}${libdir}/pkgconfig/egl.pc
+        cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
+        set -f
+        for f in ${FILES:libvdk-imx} ${FILES:libvdk-imx-dev}; do
+            set +f
+            rm -rf ${D}/$f
+        done
+        rm -rf \
+            ${D}/opt/viv_samples/es20 \
+            ${D}/opt/viv_samples/tiger \
+            ${D}/opt/viv_samples/vdk
    fi
-    # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
-    install -d ${D}${sysconfdir}/OpenCL/vendors/
-    install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
-    # Handle backend specific drivers
-    cp -r ${S}/gpu-core/usr/lib/${BACKEND}/* ${D}${libdir}
    if [ "${BACKEND}" = "wayland" ] && [ "${IS_MX8}" != "1" ]; then
        # Special case for libVDK on Wayland backend, deliver fb library as well.
        cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0
    fi
+    if [ -z "${PACKAGES_OPENCL}" ]; then
+        set -f
+        for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx} ${FILES:libclc-imx-dev}; do
+            set +f
+            rm -rf ${D}$f
+        done
+        rm -rf ${D}/opt/viv_samples/cl11
+    else
+        # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
+        install -d ${D}${sysconfdir}/OpenCL/vendors/
+        install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
+    fi
+    if [ -z "${PACKAGES_OPENVX}" ]; then
+        set -f
+        for f in ${FILES:libopenvx-imx} ${FILES:libopenvx-imx-dev}; do
+            set +f
+            rm -rf ${D}$f
+        done
+    fi
    if [ "${IS_MX8}" = "1" ]; then
        # Rename the vulkan implementation library which is wrapped by the vulkan-loader
        # library of the same name
@@ -216,6 +265,13 @@ do_install () {
        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
+                set +f
+                rm -rf ${D}$f
+            done
+        fi
    fi
    # FIXME: MX6SL does not have 3D support; hack it for now
@@ -244,6 +300,24 @@ do_install () {
    chown -R root:root "${D}"
 }
+do_install:append:libc-musl() {
+    # libs
+    for f in `find ${D}${libdir} -name '*.so*' -type f`
+    do
+        patchelf --add-needed libgcompat.so.0 $f
+    done
+    # binaries
+    for f in `find ${D}/opt ${D}${bindir} -name '*' -type f -executable`
+    do
+        # prune scripts
+        if `patchelf --print-interpreter $f 2>&1 > /dev/null`
+        then
+            patchelf --set-interpreter ${root_prefix}`patchelf --print-interpreter $f` $f
+            patchelf --add-needed libgcompat.so.0 $f
+        fi
+    done
+}
 ALLOW_EMPTY:${PN} = "1"
 FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h"
@@ -263,9 +337,9 @@ INSANE_SKIP:libgal-imx += "build-deps"
 FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}"
-FILES:libgbm-imx:mx8-nxp-bsp           = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}"
+FILES:libgbm-imx           = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}"
-FILES:libgbm-imx-dev:mx8-nxp-bsp       = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
+FILES:libgbm-imx-dev       = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
-RDEPENDS:libgbm-imx:append:mx8-nxp-bsp = " libdrm"
+RDEPENDS:libgbm-imx:append = " libdrm"
 INSANE_SKIP:libgbm-imx += "dev-so"
 FILES:libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}"
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
index bd584dbe..4136631b 100644
--- 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
@@ -1,9 +1,10 @@
 require imx-gpu-viv-6.inc
-DEPENDS:append:libc-musl = " gcompat"
-INSANE_SKIP:append:libc-musl = " file-rdeps"
 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/pango/pango_%.bbappend b/recipes-graphics/pango/pango_%.bbappend
new file mode 100644
index 00000000..bf8c38fc
--- /dev/null
+++ b/recipes-graphics/pango/pango_%.bbappend
@@ -0,0 +1,5 @@
+# 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"
+RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat"
diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
index 90776168..722896ff 100644
--- a/recipes-graphics/vulkan/vulkan-loader_%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
@@ -1,3 +1,3 @@
 # The i.MX implementation is dynamically loaded, so it requires an
 # explicit runtime dependency.
-RRECOMMENDS:${PN}:append:imxgpu = " libvulkan-imx"
+RRECOMMENDS:${PN}:append:imxvulkan = " libvulkan-imx"
diff --git a/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch b/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch
new file mode 100644
index 00000000..b9cb31fb
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch
@@ -0,0 +1,34 @@
+From 4afe9b2f9ef24ce0c9bf1cd41f94ca45afa4f445 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 12 Sep 2022 20:58:14 -0700
+Subject: [PATCH] g2d-renderer.c: Include sys/stat.h
+This is needed for getting stat() prototype, its flagged with clang-15
+as error.
+| ../git/libweston/renderer-g2d/g2d-renderer.c:2057:6: error: call to undeclared function 'stat'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+|         if (stat(gr->drm_device, &dev_stat) != 0) {
+|             ^
+| 1 error generated.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libweston/renderer-g2d/g2d-renderer.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/libweston/renderer-g2d/g2d-renderer.c b/libweston/renderer-g2d/g2d-renderer.c
+index f59fc4ee..36a458fc 100644
+--- a/libweston/renderer-g2d/g2d-renderer.c
+++ b/libweston/renderer-g2d/g2d-renderer.c
+@@ -41,6 +41,7 @@
+ #include <drm_fourcc.h>
+ #include <poll.h>
+ #include <errno.h>
+#include <sys/stat.h> /* stat() */
+ 
+ #include <libweston/libweston.h>
+ #include "g2d-renderer.h"
+-- 
+2.37.3
diff --git a/recipes-graphics/wayland/weston_10.0.0.imx.bb b/recipes-graphics/wayland/weston_10.0.0.imx.bb
index 8fce4472..cc60b4d7 100644
--- a/recipes-graphics/wayland/weston_10.0.0.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.0.imx.bb
@@ -34,6 +34,7 @@ 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)}"
@@ -160,7 +161,9 @@ 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"
+SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \
+            file://0001-g2d-renderer.c-Include-sys-stat.h.patch \
+            "
 SRCBRANCH = "weston-imx-10.0"
 SRCREV = "c8c6e3106b03441db1037afa995f95fcb2f9f17d"
@@ -175,9 +178,7 @@ PACKAGECONFIG_OPENGL:imxgpu2d     = ""
 PACKAGECONFIG_OPENGL:imxgpu3d     = "opengl"
 PACKAGECONFIG:remove = "wayland x11"
-PACKAGECONFIG:append = " \
+PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}"
-    rdp \
-    ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}"
 PACKAGECONFIG:remove:imxfbdev = "kms"
 PACKAGECONFIG:append:imxfbdev = " fbdev clients"
@@ -200,6 +201,10 @@ 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)"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch
deleted file mode 100644
index 6f232589..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ed3c55fa6260ad125a32f9ac67f9e44a9bce7cf1 Mon Sep 17 00:00:00 2001
-From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
-Date: Mon, 11 May 2020 19:12:51 -0500
-Subject: [PATCH] MGS-5186 Per Specification EGL_NATIVE_PIXMAP_KHR requires
- EGL_NO_CONTEXT
-https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_pixmap.txt
-Per Specification EGL_NATIVE_PIXMAP_KHR requires EGL_NO_CONTEXT.
-So passing context will result in error.
-Upstream-Status: Pending
-Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
---
- hw/xwayland/xwayland-glamor-gbm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: xorg-server-1.20.8/hw/xwayland/xwayland-glamor-gbm.c
-===================================================================
--- xorg-server-1.20.8.orig/hw/xwayland/xwayland-glamor-gbm.c
-+++ xorg-server-1.20.8/hw/xwayland/xwayland-glamor-gbm.c
-@@ -167,7 +167,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(Scre
-     xwl_pixmap->bo = bo;
-     xwl_pixmap->buffer = NULL;
-     xwl_pixmap->image = eglCreateImageKHR(xwl_screen->egl_display,
-                                          xwl_screen->egl_context,
-+                                          EGL_NO_CONTEXT,
-                                           EGL_NATIVE_PIXMAP_KHR,
-                                           xwl_pixmap->bo, NULL);
-     if (xwl_pixmap->image == EGL_NO_IMAGE_KHR)
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch
deleted file mode 100644
index c8f1ae73..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cc05c01925755310f027c61daa29648a10155f96 Mon Sep 17 00:00:00 2001
-From: Rohan Garg <rohan@garg.io>
-Date: Thu, 13 Dec 2018 19:15:01 +0100
-Subject: [PATCH] glamor/glamor_egl.c: EGL_NATIVE_PIXMAP_KHR do not require
- contexts
-From https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_pixmap.txt
- * If <target> is EGL_NATIVE_PIXMAP_KHR, and <ctx> is not EGL_NO_CONTEXT,
-   the error EGL_BAD_PARAMETER is generated.
-Fixes: a5321ea4 ("Allow to create textured pixmaps from gbm_bo without using gem names")
---
- glamor/glamor_egl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Upstream-Status: Backport [cc05c01925755310f027c61daa29648a10155f96]
-diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
-index 0f4edb5a3..69844d4e2 100644
--- a/glamor/glamor_egl.c
-+++ b/glamor/glamor_egl.c
-@@ -233,7 +233,7 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap,
-     glamor_make_current(glamor_priv);
- 
-     image = eglCreateImageKHR(glamor_egl->display,
-                              glamor_egl->context,
-+                              EGL_NO_CONTEXT,
-                               EGL_NATIVE_PIXMAP_KHR, bo, NULL);
-     if (image == EGL_NO_IMAGE_KHR) {
-         glamor_set_pixmap_type(pixmap, GLAMOR_DRM_ONLY);
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch
deleted file mode 100644
index 48f271ae..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 836f93de99b35050d78d61d3654f7c5655184144 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 19 Apr 2019 10:19:50 +0200
-Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx
-Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to
-Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
-In this case, build fails on:
-make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'.  Stop.
-make[3]: *** Waiting for unfinished jobs....
-Fixes:
- - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef
-Upstream-Status: Backport [836f93de99b35050d78d61d3654f7c5655184144]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
- hw/xwayland/Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
-index bc1cb8506..502879e2a 100644
--- a/hw/xwayland/Makefile.am
-+++ b/hw/xwayland/Makefile.am
-@@ -21,10 +21,14 @@ Xwayland_SOURCES =                          \
-        $(top_srcdir)/Xi/stubs.c                \
-        $(top_srcdir)/mi/miinitext.c
- 
-+if GLX
-+GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
-+endif
-+
- Xwayland_LDADD =                               \
-        $(glamor_lib)                           \
-        $(XWAYLAND_LIBS)                        \
-       $(top_builddir)/glx/libglxvnd.la        \
-+       $(GLXVND_LIB)                           \
-        $(XWAYLAND_SYS_LIBS)                    \
-        $(top_builddir)/Xext/libXvidmode.la     \
-        $(XSERVER_SYS_LIBS)
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-prefer-to-use-GLES2-for-glamor-EGL-config.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-prefer-to-use-GLES2-for-glamor-EGL-config.patch
deleted file mode 100644
index 6e140eaa..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-prefer-to-use-GLES2-for-glamor-EGL-config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a99ff39b3b6095a16977fbb13b2b453a7359850f Mon Sep 17 00:00:00 2001
-From: Xianzhong <xianzhong.li@nxp.com>
-Date: Mon, 11 Jan 2021 11:53:29 +0800
-Subject: [PATCH] prefer to use GLES2 for glamor EGL config
-created the initial patch for xorg/xserver 1.20.8
-Upstream-Status: Pending
-Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
---
- hw/xwayland/xwayland-glamor-gbm.c | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
-index dce782fc3..1fdf45490 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
-+++ b/hw/xwayland/xwayland-glamor-gbm.c
-@@ -912,13 +912,8 @@ xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen)
-     struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
-     EGLint major, minor;
-     Bool egl_initialized = FALSE;
-    static const EGLint config_attribs_core[] = {
-        EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR,
-        EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR,
-        EGL_CONTEXT_MAJOR_VERSION_KHR,
-        GLAMOR_GL_CORE_VER_MAJOR,
-        EGL_CONTEXT_MINOR_VERSION_KHR,
-        GLAMOR_GL_CORE_VER_MINOR,
-+    static const EGLint config_attribs_gles2[] = {
-+        EGL_CONTEXT_CLIENT_VERSION, 2,
-         EGL_NONE
-     };
-     const GLubyte *renderer;
-@@ -947,10 +942,10 @@ xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen)
-         goto error;
-     }
- 
-    eglBindAPI(EGL_OPENGL_API);
-+    eglBindAPI(EGL_OPENGL_ES_API);
- 
-     xwl_screen->egl_context = eglCreateContext(
-        xwl_screen->egl_display, NULL, EGL_NO_CONTEXT, config_attribs_core);
-+        xwl_screen->egl_display, NULL, EGL_NO_CONTEXT, config_attribs_gles2);
-     if (xwl_screen->egl_context == EGL_NO_CONTEXT) {
-         xwl_screen->egl_context = eglCreateContext(
-             xwl_screen->egl_display, NULL, EGL_NO_CONTEXT, NULL);
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-xfree86-define-FOURCC_NV12-and-XVIMAGE_NV12.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-xfree86-define-FOURCC_NV12-and-XVIMAGE_NV12.patch
deleted file mode 100644
index e0958558..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-xfree86-define-FOURCC_NV12-and-XVIMAGE_NV12.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3a6fe85a5f123f53319b5be8a69666174cad09cf Mon Sep 17 00:00:00 2001
-From: Julien Isorce <julien.isorce@gmail.com>
-Date: Thu, 6 Sep 2018 15:38:13 -0700
-Subject: [PATCH 1/8] xfree86: define FOURCC_NV12 and XVIMAGE_NV12
-Useful for glamor.
-Upstream-Status: Backport
-Signed-off-by: Julien Isorce <jisorce@oblong.com>
-Tested-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
- hw/xfree86/common/fourcc.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-diff --git a/hw/xfree86/common/fourcc.h b/hw/xfree86/common/fourcc.h
-index e6126b7fe..a19e6869e 100644
--- a/hw/xfree86/common/fourcc.h
-+++ b/hw/xfree86/common/fourcc.h
-@@ -156,4 +156,24 @@
-         XvTopToBottom \
-    }
- 
-+#define FOURCC_NV12 0x3231564e
-+#define XVIMAGE_NV12 \
-+   { \
-+        FOURCC_NV12, \
-+        XvYUV, \
-+        LSBFirst, \
-+        {'N','V','1','2', \
-+          0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
-+        12, \
-+        XvPlanar, \
-+        2, \
-+        0, 0, 0, 0, \
-+        8, 8, 8, \
-+        1, 2, 2, \
-+        1, 2, 2, \
-+        {'Y','U','V', \
-+          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
-+        XvTopToBottom \
-+   }
-+
- #endif                          /* _XF86_FOURCC_H_ */
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0002-glamor-add-support-for-GL_RG.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0002-glamor-add-support-for-GL_RG.patch
deleted file mode 100644
index 78988373..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0002-glamor-add-support-for-GL_RG.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 7f46b31e3d80ca769f68a4ffb201d0fc4801ea93 Mon Sep 17 00:00:00 2001
-From: Julien Isorce <julien.isorce@gmail.com>
-Date: Thu, 6 Sep 2018 15:38:14 -0700
-Subject: [PATCH 2/8] glamor: add support for GL_RG
-Allow to upload the CbCr plane of an NV12 image into a GL texture.
-Upstream-Status: Backport
-Signed-off-by: Julien Isorce <jisorce@oblong.com>
-Tested-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
- glamor/glamor.c          |  2 ++
- glamor/glamor.h          |  1 +
- glamor/glamor_priv.h     |  4 +++-
- glamor/glamor_transfer.c | 10 ++++++++--
- glamor/glamor_utils.h    |  4 ++++
- 5 files changed, 18 insertions(+), 3 deletions(-)
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index abefef614..3e9cf284c 100644
--- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -222,6 +222,8 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
- 
-     pixmap_priv = glamor_get_pixmap_private(pixmap);
- 
-+    pixmap_priv->is_cbcr = (usage == GLAMOR_CREATE_FORMAT_CBCR);
-+
-     format = gl_iformat_for_pixmap(pixmap);
- 
-     pitch = (((w * pixmap->drawable.bitsPerPixel + 7) / 8) + 3) & ~3;
-diff --git a/glamor/glamor.h b/glamor/glamor.h
-index be04bf858..e5992aa56 100644
--- a/glamor/glamor.h
-+++ b/glamor/glamor.h
-@@ -129,6 +129,7 @@ extern _X_EXPORT Bool glamor_destroy_pixmap(PixmapPtr pixmap);
- #define GLAMOR_CREATE_FBO_NO_FBO        0x103
- #define GLAMOR_CREATE_NO_LARGE          0x105
- #define GLAMOR_CREATE_PIXMAP_NO_TEXTURE 0x106
-+#define GLAMOR_CREATE_FORMAT_CBCR       0x107
- 
- /* @glamor_egl_exchange_buffers: Exchange the underlying buffers(KHR image,fbo).
-  *
-diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
-index 4353a99f1..a14aaf624 100644
--- a/glamor/glamor_priv.h
-+++ b/glamor/glamor_priv.h
-@@ -380,6 +380,8 @@ typedef struct glamor_pixmap_private {
-      * names.
-      */
-     glamor_pixmap_fbo **fbo_array;
-+
-+    Bool is_cbcr;
- } glamor_pixmap_private;
- 
- extern DevPrivateKeyRec glamor_pixmap_private_key;
-@@ -902,7 +904,7 @@ int glamor_xv_put_image(glamor_port_private *port_priv,
-                         Bool sync,
-                         RegionPtr clipBoxes);
- void glamor_xv_core_init(ScreenPtr screen);
-void glamor_xv_render(glamor_port_private *port_priv);
-+void glamor_xv_render(glamor_port_private *port_priv, int id);
- 
- #include "glamor_utils.h"
- 
-diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c
-index ebb5101d1..421ed3a5f 100644
--- a/glamor/glamor_transfer.c
-+++ b/glamor/glamor_transfer.c
-@@ -27,6 +27,7 @@
- void
- glamor_format_for_pixmap(PixmapPtr pixmap, GLenum *format, GLenum *type)
- {
-+    glamor_pixmap_private       *priv = glamor_get_pixmap_private(pixmap);
-     switch (pixmap->drawable.depth) {
-     case 24:
-     case 32:
-@@ -38,8 +39,13 @@ glamor_format_for_pixmap(PixmapPtr pixmap, GLenum *format, GLenum *type)
-         *type = GL_UNSIGNED_INT_2_10_10_10_REV;
-         break;
-     case 16:
-        *format = GL_RGB;
-        *type = GL_UNSIGNED_SHORT_5_6_5;
-+        if (priv->is_cbcr) {
-+          *format = priv->fbo->format;
-+          *type = GL_UNSIGNED_BYTE;
-+        } else {
-+          *format = GL_RGB;
-+          *type = GL_UNSIGNED_SHORT_5_6_5;
-+        }
-         break;
-     case 15:
-         *format = GL_BGRA;
-diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
-index 0d5674d63..1890c1fe5 100644
--- a/glamor/glamor_utils.h
-+++ b/glamor/glamor_utils.h
-@@ -613,10 +613,14 @@ gl_iformat_for_pixmap(PixmapPtr pixmap)
- {
-     glamor_screen_private *glamor_priv =
-         glamor_get_screen_private((pixmap)->drawable.pScreen);
-+    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
- 
-     if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
-         ((pixmap)->drawable.depth == 1 || (pixmap)->drawable.depth == 8)) {
-         return glamor_priv->one_channel_format;
-+    } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
-+               (pixmap)->drawable.depth == 16 && pixmap_priv->is_cbcr) {
-+        return GL_RG;
-     } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
-                (pixmap)->drawable.depth == 30) {
-         return GL_RGB10_A2;
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
deleted file mode 100644
index beed6cb4..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
-From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
-Date: Mon, 30 Jan 2017 16:32:06 -0600
-Subject: [PATCH] Remove check for useSIGIO option
-Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO
-option.
-As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO
-and OsReleaseSIGIO.
-No longer the check for useSIGIO is needed
-Upstream-Status: Pending
-Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
---
- hw/xfree86/os-support/shared/sigio.c | 6 ------
- 1 file changed, 6 deletions(-)
-diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
-index 884a71c..be76498 100644
--- a/hw/xfree86/os-support/shared/sigio.c
-+++ b/hw/xfree86/os-support/shared/sigio.c
-@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
-     int i;
-     int installed = FALSE;
- 
-    if (!xf86Info.useSIGIO)
-        return 0;
-
-     for (i = 0; i < MAX_FUNCS; i++) {
-         if (!xf86SigIOFuncs[i].f) {
-             if (xf86IsPipe(fd))
-@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd)
-     int max;
-     int ret;
- 
-    if (!xf86Info.useSIGIO)
-        return 0;
-
-     max = 0;
-     ret = 0;
-     for (i = 0; i < MAX_FUNCS; i++) {
-- 
-2.7.4
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0003-glamor-add-support-for-NV12-in-Xv.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0003-glamor-add-support-for-NV12-in-Xv.patch
deleted file mode 100644
index 855d1938..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0003-glamor-add-support-for-NV12-in-Xv.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-From 17a3528162304f1586329aabd606d3498bfe48a5 Mon Sep 17 00:00:00 2001
-From: Julien Isorce <julien.isorce@gmail.com>
-Date: Tue, 11 Sep 2018 10:28:33 -0700
-Subject: [PATCH 3/8] glamor: add support for NV12 in Xv
-Useful when video decoders only output NV12. Currently
-glamor Xv only supports I420 and YV12.
-Note that Intel's sna supports I420, YV12, YUY2, UYVY, NV12.
-Test: xvinfo | grep NV12
-Test: gst-launch-1.0 videotestsrc ! video/x-raw, format=NV12 ! xvimagesink
-v2: Combine the two texture2Ds on u_sampler.
-Upstream-Status: Backport
-Signed-off-by: Julien Isorce <jisorce@oblong.com>
-Tested-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
- glamor/glamor_xv.c | 180 ++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 155 insertions(+), 25 deletions(-)
-diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
-index 62fc4fff5..6fef6ed0d 100644
--- a/glamor/glamor_xv.c
-+++ b/glamor/glamor_xv.c
-@@ -59,8 +59,40 @@ typedef struct tagREF_TRANSFORM {
- #define RTFContrast(a)   (1.0 + ((a)*1.0)/1000.0)
- #define RTFHue(a)   (((a)*3.1416)/1000.0)
- 
-static const glamor_facet glamor_facet_xv_planar = {
-    .name = "xv_planar",
-+static const glamor_facet glamor_facet_xv_planar_2 = {
-+    .name = "xv_planar_2",
-+
-+    .version = 120,
-+
-+    .source_name = "v_texcoord0",
-+    .vs_vars = ("attribute vec2 position;\n"
-+                "attribute vec2 v_texcoord0;\n"
-+                "varying vec2 tcs;\n"),
-+    .vs_exec = (GLAMOR_POS(gl_Position, position)
-+                "        tcs = v_texcoord0;\n"),
-+
-+    .fs_vars = ("uniform sampler2D y_sampler;\n"
-+                "uniform sampler2D u_sampler;\n"
-+                "uniform vec4 offsetyco;\n"
-+                "uniform vec4 ucogamma;\n"
-+                "uniform vec4 vco;\n"
-+                "varying vec2 tcs;\n"),
-+    .fs_exec = (
-+                "        float sample;\n"
-+                "        vec2 sample_uv;\n"
-+                "        vec4 temp1;\n"
-+                "        sample = texture2D(y_sampler, tcs).w;\n"
-+                "        temp1.xyz = offsetyco.www * vec3(sample) + offsetyco.xyz;\n"
-+                "        sample_uv = texture2D(u_sampler, tcs).xy;\n"
-+                "        temp1.xyz = ucogamma.xyz * vec3(sample_uv.x) + temp1.xyz;\n"
-+                "        temp1.xyz = clamp(vco.xyz * vec3(sample_uv.y) + temp1.xyz, 0.0, 1.0);\n"
-+                "        temp1.w = 1.0;\n"
-+                "        gl_FragColor = temp1;\n"
-+                ),
-+};
-+
-+static const glamor_facet glamor_facet_xv_planar_3 = {
-+    .name = "xv_planar_3",
- 
-     .version = 120,
- 
-@@ -110,26 +142,50 @@ Atom glamorBrightness, glamorContrast, glamorSaturation, glamorHue,
- XvImageRec glamor_xv_images[] = {
-     XVIMAGE_YV12,
-     XVIMAGE_I420,
-+    XVIMAGE_NV12
- };
- int glamor_xv_num_images = ARRAY_SIZE(glamor_xv_images);
- 
- static void
-glamor_init_xv_shader(ScreenPtr screen)
-+glamor_init_xv_shader(ScreenPtr screen, int id)
- {
-     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-     GLint sampler_loc;
-+    const glamor_facet *glamor_facet_xv_planar = NULL;
-+
-+    switch (id) {
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        glamor_facet_xv_planar = &glamor_facet_xv_planar_3;
-+        break;
-+    case FOURCC_NV12:
-+        glamor_facet_xv_planar = &glamor_facet_xv_planar_2;
-+        break;
-+    default:
-+        break;
-+    }
- 
-     glamor_build_program(screen,
-                          &glamor_priv->xv_prog,
-                         &glamor_facet_xv_planar, NULL, NULL, NULL);
-+                         glamor_facet_xv_planar, NULL, NULL, NULL);
- 
-     glUseProgram(glamor_priv->xv_prog.prog);
-     sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "y_sampler");
-     glUniform1i(sampler_loc, 0);
-     sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "u_sampler");
-     glUniform1i(sampler_loc, 1);
-    sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "v_sampler");
-    glUniform1i(sampler_loc, 2);
-+
-+    switch (id) {
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        sampler_loc = glGetUniformLocation(glamor_priv->xv_prog.prog, "v_sampler");
-+        glUniform1i(sampler_loc, 2);
-+        break;
-+    case FOURCC_NV12:
-+        break;
-+    default:
-+        break;
-+    }
- 
- }
- 
-@@ -227,6 +283,21 @@ glamor_xv_query_image_attributes(int id,
-             offsets[2] = size;
-         size += tmp;
-         break;
-+    case FOURCC_NV12:
-+        *w = ALIGN(*w, 2);
-+        *h = ALIGN(*h, 2);
-+        size = ALIGN(*w, 4);
-+        if (pitches)
-+            pitches[0] = size;
-+        size *= *h;
-+        if (offsets)
-+            offsets[1] = offsets[2] = size;
-+        tmp = ALIGN(*w, 4);
-+        if (pitches)
-+            pitches[1] = pitches[2] = tmp;
-+        tmp *= (*h >> 1);
-+        size += tmp;
-+        break;
-     }
-     return size;
- }
-@@ -240,7 +311,7 @@ static REF_TRANSFORM trans[2] = {
- };
- 
- void
-glamor_xv_render(glamor_port_private *port_priv)
-+glamor_xv_render(glamor_port_private *port_priv, int id)
- {
-     ScreenPtr screen = port_priv->pPixmap->drawable.pScreen;
-     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-@@ -264,7 +335,7 @@ glamor_xv_render(glamor_port_private *port_priv)
-     int dst_box_index;
- 
-     if (!glamor_priv->xv_prog.prog)
-        glamor_init_xv_shader(screen);
-+        glamor_init_xv_shader(screen, id);
- 
-     cont = RTFContrast(port_priv->contrast);
-     bright = RTFBrightness(port_priv->brightness);
-@@ -293,6 +364,8 @@ glamor_xv_render(glamor_port_private *port_priv)
-                 glamor_get_pixmap_private(port_priv->src_pix[i]);
-             pixmap_priv_get_scale(src_pixmap_priv[i], &src_xscale[i],
-                                   &src_yscale[i]);
-+        } else {
-+           src_pixmap_priv[i] = NULL;
-         }
-     }
-     glamor_make_current(glamor_priv);
-@@ -319,12 +392,21 @@ glamor_xv_render(glamor_port_private *port_priv)
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- 
-    glActiveTexture(GL_TEXTURE2);
-    glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->fbo->tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-+    switch (id) {
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        glActiveTexture(GL_TEXTURE2);
-+        glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->fbo->tex);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-+        break;
-+    case FOURCC_NV12:
-+        break;
-+    default:
-+        break;
-+    }
- 
-     glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
-     glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
-@@ -336,7 +418,7 @@ glamor_xv_render(glamor_port_private *port_priv)
-     /* Set up a single primitive covering the area being drawn.  We'll
-      * clip it to port_priv->clip using GL scissors instead of just
-      * emitting a GL_QUAD per box, because this way we hopefully avoid
-     * diagonal tearing between the two trangles used to rasterize a
-+     * diagonal tearing between the two triangles used to rasterize a
-      * GL_QUAD.
-      */
-     i = 0;
-@@ -417,6 +499,7 @@ glamor_xv_put_image(glamor_port_private *port_priv,
-                     RegionPtr clipBoxes)
- {
-     ScreenPtr pScreen = pDrawable->pScreen;
-+    glamor_screen_private *glamor_priv = glamor_get_screen_private(pScreen);
-     int srcPitch, srcPitch2;
-     int top, nlines;
-     int s2offset, s3offset, tmp;
-@@ -425,9 +508,16 @@ glamor_xv_put_image(glamor_port_private *port_priv,
-     s2offset = s3offset = srcPitch2 = 0;
- 
-     if (!port_priv->src_pix[0] ||
-        (width != port_priv->src_pix_w || height != port_priv->src_pix_h)) {
-+        (width != port_priv->src_pix_w || height != port_priv->src_pix_h) ||
-+        (port_priv->src_pix[2] && id == FOURCC_NV12) ||
-+        (!port_priv->src_pix[2] && id != FOURCC_NV12)) {
-         int i;
- 
-+        if (glamor_priv->xv_prog.prog) {
-+            glDeleteProgram(glamor_priv->xv_prog.prog);
-+            glamor_priv->xv_prog.prog = 0;
-+        }
-+
-         for (i = 0; i < 3; i++)
-             if (port_priv->src_pix[i])
-                 glamor_destroy_pixmap(port_priv->src_pix[i]);
-@@ -435,17 +525,34 @@ glamor_xv_put_image(glamor_port_private *port_priv,
-         port_priv->src_pix[0] =
-             glamor_create_pixmap(pScreen, width, height, 8,
-                                  GLAMOR_CREATE_FBO_NO_FBO);
-        port_priv->src_pix[1] =
-            glamor_create_pixmap(pScreen, width >> 1, height >> 1, 8,
-                                 GLAMOR_CREATE_FBO_NO_FBO);
-        port_priv->src_pix[2] =
-            glamor_create_pixmap(pScreen, width >> 1, height >> 1, 8,
-                                 GLAMOR_CREATE_FBO_NO_FBO);
-+
-+        switch (id) {
-+        case FOURCC_YV12:
-+        case FOURCC_I420:
-+            port_priv->src_pix[1] =
-+                glamor_create_pixmap(pScreen, width >> 1, height >> 1, 8,
-+                                     GLAMOR_CREATE_FBO_NO_FBO);
-+            port_priv->src_pix[2] =
-+                glamor_create_pixmap(pScreen, width >> 1, height >> 1, 8,
-+                                     GLAMOR_CREATE_FBO_NO_FBO);
-+            if (!port_priv->src_pix[2])
-+                return BadAlloc;
-+            break;
-+        case FOURCC_NV12:
-+            port_priv->src_pix[1] =
-+                glamor_create_pixmap(pScreen, width >> 1, height >> 1, 16,
-+                                     GLAMOR_CREATE_FBO_NO_FBO |
-+                                     GLAMOR_CREATE_FORMAT_CBCR);
-+            port_priv->src_pix[2] = NULL;
-+            break;
-+        default:
-+            return BadMatch;
-+        }
-+
-         port_priv->src_pix_w = width;
-         port_priv->src_pix_h = height;
- 
-        if (!port_priv->src_pix[0] || !port_priv->src_pix[1] ||
-            !port_priv->src_pix[2])
-+        if (!port_priv->src_pix[0] || !port_priv->src_pix[1])
-             return BadAlloc;
-     }
- 
-@@ -489,6 +596,29 @@ glamor_xv_put_image(glamor_port_private *port_priv,
-                             0, 0, 0, 0,
-                             buf + s3offset, srcPitch2);
-         break;
-+    case FOURCC_NV12:
-+        srcPitch = ALIGN(width, 4);
-+        s2offset = srcPitch * height;
-+        s2offset += ((top >> 1) * srcPitch);
-+
-+        full_box.x1 = 0;
-+        full_box.y1 = 0;
-+        full_box.x2 = width;
-+        full_box.y2 = nlines;
-+
-+        half_box.x1 = 0;
-+        half_box.y1 = 0;
-+        half_box.x2 = width;
-+        half_box.y2 = (nlines + 1) >> 1;
-+
-+        glamor_upload_boxes(port_priv->src_pix[0], &full_box, 1,
-+                            0, 0, 0, 0,
-+                            buf + (top * srcPitch), srcPitch);
-+
-+        glamor_upload_boxes(port_priv->src_pix[1], &half_box, 1,
-+                            0, 0, 0, 0,
-+                            buf + s2offset, srcPitch);
-+        break;
-     default:
-         return BadMatch;
-     }
-@@ -511,7 +641,7 @@ glamor_xv_put_image(glamor_port_private *port_priv,
-     port_priv->w = width;
-     port_priv->h = height;
-     port_priv->pDraw = pDrawable;
-    glamor_xv_render(port_priv);
-+    glamor_xv_render(port_priv, id);
-     return Success;
- }
- 
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0004-glamor-Remove-unused-format_for_pixmap-helper.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0004-glamor-Remove-unused-format_for_pixmap-helper.patch
deleted file mode 100644
index c116576f..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0004-glamor-Remove-unused-format_for_pixmap-helper.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 69892ca6a623057ed4e3be0c22cb7fd812425024 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
-Date: Wed, 19 Dec 2018 10:11:22 +0100
-Subject: [PATCH 4/8] glamor: Remove unused format_for_pixmap helper
-Upstream-Status: Backport
-Reviewed-by: Eric Anholt <eric@anholt.net>
---
- glamor/glamor_utils.h | 6 ------
- 1 file changed, 6 deletions(-)
-diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
-index 1890c1fe5..8a147ca7e 100644
--- a/glamor/glamor_utils.h
-+++ b/glamor/glamor_utils.h
-@@ -629,12 +629,6 @@ gl_iformat_for_pixmap(PixmapPtr pixmap)
-     }
- }
- 
-static inline CARD32
-format_for_pixmap(PixmapPtr pixmap)
-{
-    return format_for_depth((pixmap)->drawable.depth);
-}
-
- #define REVERT_NONE                    0
- #define REVERT_NORMAL                  1
- #define REVERT_UPLOADING_A1            3
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0005-glamor-Stop-trying-to-store-the-pixmap-s-format-in-g.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0005-glamor-Stop-trying-to-store-the-pixmap-s-format-in-g.patch
deleted file mode 100644
index 9a0aa7ab..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0005-glamor-Stop-trying-to-store-the-pixmap-s-format-in-g.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 2498f6712c3b551c4d8104628aff78246b5cd6c8 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Tue, 26 Mar 2019 15:58:59 -0700
-Subject: [PATCH 5/8] glamor: Stop trying to store the pixmap's "format" in
- glamor_pixmap_fbo.
-"format" is a bit of a confused term (internalformat vs GL format),
-and all we really needed was "is this GL_RED?"
-Upstream-Status: Backport
-Signed-off-by: Eric Anholt <eric@anholt.net>
---
- glamor/glamor.c          |  3 +--
- glamor/glamor_fbo.c      |  7 ++++---
- glamor/glamor_priv.h     | 13 ++-----------
- glamor/glamor_render.c   |  2 +-
- glamor/glamor_transfer.c |  2 +-
- 5 files changed, 9 insertions(+), 18 deletions(-)
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index 3e9cf284c..c36b6ea74 100644
--- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -184,8 +184,7 @@ glamor_bind_texture(glamor_screen_private *glamor_priv, GLenum texture,
-     /* Is the operand a GL_RED fbo?
-      */
- 
-    if (glamor_fbo_red_is_alpha(glamor_priv, fbo)) {
-
-+    if (fbo->is_red) {
-         /* If destination is also GL_RED, then preserve the bits in
-          * the R channel */
- 
-diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
-index f939a6c2f..58eb97bf4 100644
--- a/glamor/glamor_fbo.c
-+++ b/glamor/glamor_fbo.c
-@@ -95,7 +95,7 @@ glamor_pixmap_ensure_fb(glamor_screen_private *glamor_priv,
- 
- glamor_pixmap_fbo *
- glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
-                           int w, int h, GLenum format, GLint tex, int flag)
-+                           int w, int h, Bool is_red, GLint tex, int flag)
- {
-     glamor_pixmap_fbo *fbo;
- 
-@@ -106,7 +106,7 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
-     fbo->tex = tex;
-     fbo->width = w;
-     fbo->height = h;
-    fbo->format = format;
-+    fbo->is_red = is_red;
- 
-     if (flag != GLAMOR_CREATE_FBO_NO_FBO) {
-         if (glamor_pixmap_ensure_fb(glamor_priv, fbo) != 0) {
-@@ -163,7 +163,8 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
-     if (!tex) /* Texture creation failed due to GL_OUT_OF_MEMORY */
-         return NULL;
- 
-    return glamor_create_fbo_from_tex(glamor_priv, w, h, format, tex, flag);
-+    return glamor_create_fbo_from_tex(glamor_priv, w, h, format == GL_RED,
-+                                      tex, flag);
- }
- 
- /**
-diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
-index a14aaf624..e70d349da 100644
--- a/glamor/glamor_priv.h
-+++ b/glamor/glamor_priv.h
-@@ -317,8 +317,7 @@ typedef struct glamor_pixmap_fbo {
-     GLuint fb; /**< GL FBO name */
-     int width; /**< width in pixels */
-     int height; /**< height in pixels */
-    GLenum format; /**< GL format used to create the texture. */
-    GLenum type; /**< GL type used to create the texture. */
-+    Bool is_red;
- } glamor_pixmap_fbo;
- 
- typedef struct glamor_pixmap_clipped_regions {
-@@ -533,7 +532,7 @@ glamor_pixmap_fbo *glamor_pixmap_detach_fbo(glamor_pixmap_private *
- void glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo);
- glamor_pixmap_fbo *glamor_create_fbo_from_tex(glamor_screen_private *
-                                               glamor_priv, int w, int h,
-                                              GLenum format, GLint tex,
-+                                              Bool is_red, GLint tex,
-                                               int flag);
- glamor_pixmap_fbo *glamor_create_fbo(glamor_screen_private *glamor_priv, int w,
-                                      int h, GLenum format, int flag);
-@@ -549,14 +548,6 @@ static inline Bool glamor_picture_is_alpha(PicturePtr picture)
-     return picture->format == PICT_a1 || picture->format == PICT_a8;
- }
- 
-/* Return whether 'fbo' is storing alpha bits in the red channel */
-static inline Bool
-glamor_fbo_red_is_alpha(glamor_screen_private *glamor_priv, glamor_pixmap_fbo *fbo)
-{
-    /* True when the format is GL_RED (that can only happen when our one channel format is GL_RED */
-    return fbo->format == GL_RED;
-}
-
- /* Return whether 'picture' is storing alpha bits in the red channel */
- static inline Bool
- glamor_picture_red_is_alpha(PicturePtr picture)
-diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
-index d5737018f..6db6bfbc3 100644
--- a/glamor/glamor_render.c
-+++ b/glamor/glamor_render.c
-@@ -529,7 +529,7 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
-      * sometimes get zero bits in the R channel, which is harmless.
-      */
-     glamor_bind_texture(glamor_priv, GL_TEXTURE0 + unit, fbo,
-                        glamor_fbo_red_is_alpha(glamor_priv, dest_priv->fbo));
-+                        dest_priv->fbo->is_red);
-     repeat_type = picture->repeatType;
-     switch (picture->repeatType) {
-     case RepeatNone:
-diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c
-index 421ed3a5f..215752d7b 100644
--- a/glamor/glamor_transfer.c
-+++ b/glamor/glamor_transfer.c
-@@ -40,7 +40,7 @@ glamor_format_for_pixmap(PixmapPtr pixmap, GLenum *format, GLenum *type)
-         break;
-     case 16:
-         if (priv->is_cbcr) {
-          *format = priv->fbo->format;
-+          *format = GL_RG;
-           *type = GL_UNSIGNED_BYTE;
-         } else {
-           *format = GL_RGB;
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0006-glamor-Plumb-the-pixmap-through-fbo-creation-instead.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0006-glamor-Plumb-the-pixmap-through-fbo-creation-instead.patch
deleted file mode 100644
index 66d2877c..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0006-glamor-Plumb-the-pixmap-through-fbo-creation-instead.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From 3c14a16e1b4277aa00a2b23d5758d99dc20ca819 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Tue, 26 Mar 2019 16:57:24 -0700
-Subject: [PATCH 6/8] glamor: Plumb the pixmap through fbo creation instead of
- a "format"
-For GLES, we're going to need a lot more logic for picking the
-iformat/format/type of texture setup, so we'll want the pixmap's depth
-and is_cbcr flag.
-Upstream-Status: Backport
-Signed-off-by: Eric Anholt <eric@anholt.net>
---
- glamor/glamor.c         | 20 +++++++-------------
- glamor/glamor_fbo.c     | 33 +++++++++++++++++++--------------
- glamor/glamor_picture.c |  2 +-
- glamor/glamor_priv.h    | 12 ++++++------
- 4 files changed, 33 insertions(+), 34 deletions(-)
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index c36b6ea74..f618c2128 100644
--- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -106,7 +106,6 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
-     glamor_pixmap_private *pixmap_priv;
-     glamor_screen_private *glamor_priv;
-     glamor_pixmap_fbo *fbo;
-    GLenum format;
- 
-     glamor_priv = glamor_get_screen_private(screen);
-     pixmap_priv = glamor_get_pixmap_private(pixmap);
-@@ -116,9 +115,9 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
-         glamor_destroy_fbo(glamor_priv, fbo);
-     }
- 
-    format = gl_iformat_for_pixmap(pixmap);
-    fbo = glamor_create_fbo_from_tex(glamor_priv, pixmap->drawable.width,
-                                     pixmap->drawable.height, format, tex, 0);
-+    fbo = glamor_create_fbo_from_tex(glamor_priv, pixmap,
-+                                     pixmap->drawable.width,
-+                                     pixmap->drawable.height, tex, 0);
- 
-     if (fbo == NULL) {
-         ErrorF("XXX fail to create fbo.\n");
-@@ -204,7 +203,6 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
-     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-     glamor_pixmap_fbo *fbo = NULL;
-     int pitch;
-    GLenum format;
- 
-     if (w > 32767 || h > 32767)
-         return NullPixmap;
-@@ -223,8 +221,6 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
- 
-     pixmap_priv->is_cbcr = (usage == GLAMOR_CREATE_FORMAT_CBCR);
- 
-    format = gl_iformat_for_pixmap(pixmap);
-
-     pitch = (((w * pixmap->drawable.bitsPerPixel + 7) / 8) + 3) & ~3;
-     screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, pitch, NULL);
- 
-@@ -238,12 +234,12 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
-         glamor_check_fbo_size(glamor_priv, w, h))
-     {
-         glamor_init_pixmap_private_small(pixmap, pixmap_priv);
-        fbo = glamor_create_fbo(glamor_priv, w, h, format, usage);
-+        fbo = glamor_create_fbo(glamor_priv, pixmap, w, h, usage);
-     } else {
-         int tile_size = glamor_priv->max_fbo_size;
-         DEBUGF("Create LARGE pixmap %p width %d height %d, tile size %d\n",
-                pixmap, w, h, tile_size);
-        fbo = glamor_create_fbo_array(glamor_priv, w, h, format, usage,
-+        fbo = glamor_create_fbo_array(glamor_priv, pixmap, usage,
-                                       tile_size, tile_size, pixmap_priv);
-     }
- 
-@@ -860,8 +856,7 @@ _glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
-     switch (pixmap_priv->type) {
-     case GLAMOR_TEXTURE_DRM:
-     case GLAMOR_TEXTURE_ONLY:
-        if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
-                                      GL_RGB10_A2 : GL_RGBA, 0))
-+        if (!glamor_pixmap_ensure_fbo(pixmap, 0))
-             return 0;
- 
-         if (modifier) {
-@@ -937,8 +932,7 @@ glamor_name_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
-     switch (pixmap_priv->type) {
-     case GLAMOR_TEXTURE_DRM:
-     case GLAMOR_TEXTURE_ONLY:
-        if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
-                                      GL_RGB10_A2 : GL_RGBA, 0))
-+        if (!glamor_pixmap_ensure_fbo(pixmap, 0))
-             return -1;
-         return glamor_egl_fd_name_from_pixmap(pixmap->drawable.pScreen,
-                                               pixmap, stride, size);
-diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
-index 58eb97bf4..75f7e2baa 100644
--- a/glamor/glamor_fbo.c
-+++ b/glamor/glamor_fbo.c
-@@ -95,8 +95,9 @@ glamor_pixmap_ensure_fb(glamor_screen_private *glamor_priv,
- 
- glamor_pixmap_fbo *
- glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
-                           int w, int h, Bool is_red, GLint tex, int flag)
-+                           PixmapPtr pixmap, int w, int h, GLint tex, int flag)
- {
-+    GLenum format = gl_iformat_for_pixmap(pixmap);
-     glamor_pixmap_fbo *fbo;
- 
-     fbo = calloc(1, sizeof(*fbo));
-@@ -106,7 +107,7 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
-     fbo->tex = tex;
-     fbo->width = w;
-     fbo->height = h;
-    fbo->is_red = is_red;
-+    fbo->is_red = format == GL_RED;
- 
-     if (flag != GLAMOR_CREATE_FBO_NO_FBO) {
-         if (glamor_pixmap_ensure_fb(glamor_priv, fbo) != 0) {
-@@ -120,13 +121,15 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
- 
- static int
- _glamor_create_tex(glamor_screen_private *glamor_priv,
-                   int w, int h, GLenum format)
-+                   PixmapPtr pixmap, int w, int h)
- {
-+    GLenum iformat = gl_iformat_for_pixmap(pixmap);
-+    GLenum format = iformat;
-     unsigned int tex;
-    GLenum iformat = format;
- 
-     if (format == GL_RGB10_A2)
-         format = GL_RGBA;
-+
-     glamor_make_current(glamor_priv);
-     glGenTextures(1, &tex);
-     glBindTexture(GL_TEXTURE_2D, tex);
-@@ -156,14 +159,14 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
- 
- glamor_pixmap_fbo *
- glamor_create_fbo(glamor_screen_private *glamor_priv,
-                  int w, int h, GLenum format, int flag)
-+                  PixmapPtr pixmap, int w, int h, int flag)
- {
-    GLint tex = _glamor_create_tex(glamor_priv, w, h, format);
-+    GLint tex = _glamor_create_tex(glamor_priv, pixmap, w, h);
- 
-     if (!tex) /* Texture creation failed due to GL_OUT_OF_MEMORY */
-         return NULL;
- 
-    return glamor_create_fbo_from_tex(glamor_priv, w, h, format == GL_RED,
-+    return glamor_create_fbo_from_tex(glamor_priv, pixmap, w, h,
-                                       tex, flag);
- }
- 
-@@ -173,10 +176,12 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
-  */
- glamor_pixmap_fbo *
- glamor_create_fbo_array(glamor_screen_private *glamor_priv,
-                         int w, int h, GLenum format, int flag,
-+                        PixmapPtr pixmap, int flag,
-                          int block_w, int block_h,
-                          glamor_pixmap_private *priv)
- {
-+    int w = pixmap->drawable.width;
-+    int h = pixmap->drawable.height;
-     int block_wcnt;
-     int block_hcnt;
-     glamor_pixmap_fbo **fbo_array;
-@@ -216,8 +221,8 @@ glamor_create_fbo_array(glamor_screen_private *glamor_priv,
-                 box_array[i * block_wcnt + j].x2 - box_array[i * block_wcnt +
-                                                              j].x1;
-             fbo_array[i * block_wcnt + j] = glamor_create_fbo(glamor_priv,
-+                                                              pixmap,
-                                                               fbo_w, fbo_h,
-                                                              format,
-                                                               GLAMOR_CREATE_PIXMAP_FIXUP);
-             if (fbo_array[i * block_wcnt + j] == NULL)
-                 goto cleanup;
-@@ -315,7 +320,7 @@ glamor_pixmap_destroy_fbo(PixmapPtr pixmap)
- }
- 
- Bool
-glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag)
-+glamor_pixmap_ensure_fbo(PixmapPtr pixmap, int flag)
- {
-     glamor_screen_private *glamor_priv;
-     glamor_pixmap_private *pixmap_priv;
-@@ -325,8 +330,8 @@ glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag)
-     pixmap_priv = glamor_get_pixmap_private(pixmap);
-     if (pixmap_priv->fbo == NULL) {
- 
-        fbo = glamor_create_fbo(glamor_priv, pixmap->drawable.width,
-                                pixmap->drawable.height, format, flag);
-+        fbo = glamor_create_fbo(glamor_priv, pixmap, pixmap->drawable.width,
-+                                pixmap->drawable.height, flag);
-         if (fbo == NULL)
-             return FALSE;
- 
-@@ -336,8 +341,8 @@ glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag)
-         /* We do have a fbo, but it may lack of fb or tex. */
-         if (!pixmap_priv->fbo->tex)
-             pixmap_priv->fbo->tex =
-                _glamor_create_tex(glamor_priv, pixmap->drawable.width,
-                                   pixmap->drawable.height, format);
-+                _glamor_create_tex(glamor_priv, pixmap, pixmap->drawable.width,
-+                                   pixmap->drawable.height);
- 
-         if (flag != GLAMOR_CREATE_FBO_NO_FBO && pixmap_priv->fbo->fb == 0)
-             if (glamor_pixmap_ensure_fb(glamor_priv, pixmap_priv->fbo) != 0)
-diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
-index 685d8d618..e6d387d42 100644
--- a/glamor/glamor_picture.c
-+++ b/glamor/glamor_picture.c
-@@ -340,7 +340,7 @@ glamor_upload_picture_to_texture(PicturePtr picture)
-     else
-         iformat = format;
- 
-    if (!glamor_pixmap_ensure_fbo(pixmap, iformat, GLAMOR_CREATE_FBO_NO_FBO)) {
-+    if (!glamor_pixmap_ensure_fbo(pixmap, GLAMOR_CREATE_FBO_NO_FBO)) {
-         ret = FALSE;
-         goto fail;
-     }
-diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
-index e70d349da..a87caec9b 100644
--- a/glamor/glamor_priv.h
-+++ b/glamor/glamor_priv.h
-@@ -531,11 +531,11 @@ glamor_pixmap_fbo *glamor_pixmap_detach_fbo(glamor_pixmap_private *
-                                             pixmap_priv);
- void glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo);
- glamor_pixmap_fbo *glamor_create_fbo_from_tex(glamor_screen_private *
-                                              glamor_priv, int w, int h,
-                                              Bool is_red, GLint tex,
-+                                              glamor_priv, PixmapPtr pixmap,
-+                                              int w, int h, GLint tex,
-                                               int flag);
-glamor_pixmap_fbo *glamor_create_fbo(glamor_screen_private *glamor_priv, int w,
-                                     int h, GLenum format, int flag);
-+glamor_pixmap_fbo *glamor_create_fbo(glamor_screen_private *glamor_priv,
-+                                     PixmapPtr pixmap, int w, int h, int flag);
- void glamor_destroy_fbo(glamor_screen_private *glamor_priv,
-                         glamor_pixmap_fbo *fbo);
- void glamor_pixmap_destroy_fbo(PixmapPtr pixmap);
-@@ -563,7 +563,7 @@ void glamor_bind_texture(glamor_screen_private *glamor_priv,
-                          Bool destination_red);
- 
- glamor_pixmap_fbo *glamor_create_fbo_array(glamor_screen_private *glamor_priv,
-                                           int w, int h, GLenum format,
-+                                           PixmapPtr pixmap,
-                                            int flag, int block_w, int block_h,
-                                            glamor_pixmap_private *);
- 
-@@ -673,7 +673,7 @@ glamor_put_vbo_space(ScreenPtr screen);
-  * the fbo has valid texture and attach to a valid fb.
-  * If the fbo already has a valid glfbo then do nothing.
-  */
-Bool glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag);
-+Bool glamor_pixmap_ensure_fbo(PixmapPtr pixmap, int flag);
- 
- glamor_pixmap_clipped_regions *
- glamor_compute_clipped_regions(PixmapPtr pixmap,
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0007-glamor-Switch-the-gl_flavor-to-a-boolean-is_gles.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0007-glamor-Switch-the-gl_flavor-to-a-boolean-is_gles.patch
deleted file mode 100644
index f2947f32..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0007-glamor-Switch-the-gl_flavor-to-a-boolean-is_gles.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From 3a03576d672d24f19fdb930b08afde9a3a3f55da Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Tue, 26 Mar 2019 15:02:38 -0700
-Subject: [PATCH 7/8] glamor: Switch the gl_flavor to a boolean is_gles.
-There are only 2 flavors we are distinguishing -- GL versions are
-handled separately.
-Upstream-Status: Backport
-Signed-off-by: Eric Anholt <eric@anholt.net>
---
- glamor/glamor.c         | 20 +++++++++-----------
- glamor/glamor_picture.c | 22 +++++++++++-----------
- glamor/glamor_pixmap.c  |  2 +-
- glamor/glamor_priv.h    |  7 +------
- glamor/glamor_program.c |  2 +-
- glamor/glamor_render.c  |  2 +-
- glamor/glamor_utils.h   |  6 +++---
- 7 files changed, 27 insertions(+), 34 deletions(-)
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index f618c2128..019edbbb1 100644
--- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -505,10 +505,8 @@ glamor_init(ScreenPtr screen, unsigned int flags)
- 
-     glamor_make_current(glamor_priv);
- 
-    if (epoxy_is_desktop_gl())
-        glamor_priv->gl_flavor = GLAMOR_GL_DESKTOP;
-    else
-        glamor_priv->gl_flavor = GLAMOR_GL_ES2;
-+    if (!epoxy_is_desktop_gl())
-+        glamor_priv->is_gles = TRUE;
- 
-     gl_version = epoxy_gl_version();
- 
-@@ -540,7 +538,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
-     }
-     glamor_priv->glsl_version = glsl_major * 100 + glsl_minor;
- 
-    if (glamor_priv->gl_flavor == GLAMOR_GL_ES2) {
-+    if (glamor_priv->is_gles) {
-         /* Force us back to the base version of our programs on an ES
-          * context, anyway.  Basically glamor only uses desktop 1.20
-          * or 1.30 currently.  1.30's new features are also present in
-@@ -564,7 +562,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
-      * have support for it, with most of the ones lacking it being on
-      * Windows with Intel 4-series (G45) graphics or older.
-      */
-    if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+    if (!glamor_priv->is_gles) {
-         if (gl_version < 21) {
-             ErrorF("Require OpenGL version 2.1 or later.\n");
-             goto fail;
-@@ -610,7 +608,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
-     }
- 
-     glamor_priv->has_rw_pbo = FALSE;
-    if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
-+    if (!glamor_priv->is_gles)
-         glamor_priv->has_rw_pbo = TRUE;
- 
-     glamor_priv->has_khr_debug = epoxy_has_gl_extension("GL_KHR_debug");
-@@ -628,11 +626,11 @@ glamor_init(ScreenPtr screen, unsigned int flags)
-     glamor_priv->has_nv_texture_barrier =
-         epoxy_has_gl_extension("GL_NV_texture_barrier");
-     glamor_priv->has_unpack_subimage =
-        glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP ||
-+        !glamor_priv->is_gles ||
-         epoxy_gl_version() >= 30 ||
-         epoxy_has_gl_extension("GL_EXT_unpack_subimage");
-     glamor_priv->has_pack_subimage =
-        glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP ||
-+        !glamor_priv->is_gles ||
-         epoxy_gl_version() >= 30 ||
-         epoxy_has_gl_extension("GL_NV_pack_subimage");
-     glamor_priv->has_dual_blend =
-@@ -643,7 +641,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
- 
-     glamor_setup_debug_output(screen);
- 
-    glamor_priv->use_quads = (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) &&
-+    glamor_priv->use_quads = !glamor_priv->is_gles &&
-                              !glamor_priv->is_core_profile;
- 
-     /* Driver-specific hack: Avoid using GL_QUADS on VC4, where
-@@ -665,7 +663,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
- 
-     glamor_priv->has_texture_swizzle =
-         (epoxy_has_gl_extension("GL_ARB_texture_swizzle") ||
-         (glamor_priv->gl_flavor != GLAMOR_GL_DESKTOP && gl_version >= 30));
-+         (glamor_priv->is_gles && gl_version >= 30));
- 
-     glamor_priv->one_channel_format = GL_ALPHA;
-     if (epoxy_has_gl_extension("GL_ARB_texture_rg") &&
-diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
-index e6d387d42..ed2decc83 100644
--- a/glamor/glamor_picture.c
-+++ b/glamor/glamor_picture.c
-@@ -90,7 +90,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     case PICT_b8g8r8x8:
-     case PICT_b8g8r8a8:
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_format = GL_BGRA;
-             *tex_type = GL_UNSIGNED_INT_8_8_8_8;
-         } else {
-@@ -109,7 +109,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     case PICT_x8r8g8b8:
-     case PICT_a8r8g8b8:
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_format = GL_BGRA;
-             *tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-         } else {
-@@ -128,7 +128,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
-     case PICT_x8b8g8r8:
-     case PICT_a8b8g8r8:
-         *tex_format = GL_RGBA;
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-         } else {
-             *tex_format = GL_RGBA;
-@@ -141,7 +141,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     case PICT_x2r10g10b10:
-     case PICT_a2r10g10b10:
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_format = GL_BGRA;
-             *tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
-         } else {
-@@ -151,7 +151,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     case PICT_x2b10g10r10:
-     case PICT_a2b10g10r10:
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_format = GL_RGBA;
-             *tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
-         } else {
-@@ -165,7 +165,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
-         break;
-     case PICT_b5g6r5:
-         *tex_format = GL_RGB;
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_type = GL_UNSIGNED_SHORT_5_6_5_REV;
-         } else {
-             *tex_type = GL_UNSIGNED_SHORT_5_6_5;
-@@ -177,7 +177,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
-     case PICT_x1b5g5r5:
-     case PICT_a1b5g5r5:
-         *tex_format = GL_RGBA;
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-         } else {
-             return FALSE;
-@@ -186,7 +186,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     case PICT_x1r5g5b5:
-     case PICT_a1r5g5b5:
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_format = GL_BGRA;
-             *tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-         } else {
-@@ -201,7 +201,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     case PICT_x4r4g4b4:
-     case PICT_a4r4g4b4:
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_format = GL_BGRA;
-             *tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
-         } else {
-@@ -213,7 +213,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     case PICT_x4b4g4r4:
-     case PICT_a4b4g4r4:
-        if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-+        if (!glamor_priv->is_gles) {
-             *tex_format = GL_RGBA;
-             *tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
-         } else {
-@@ -335,7 +335,7 @@ glamor_upload_picture_to_texture(PicturePtr picture)
-         stride = pixman_image_get_stride(converted_image);
-     }
- 
-    if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
-+    if (!glamor_priv->is_gles)
-         iformat = gl_iformat_for_pixmap(pixmap);
-     else
-         iformat = format;
-diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
-index 166bde509..9aa169cdc 100644
--- a/glamor/glamor_pixmap.c
-+++ b/glamor/glamor_pixmap.c
-@@ -124,7 +124,7 @@ glamor_set_alu(ScreenPtr screen, unsigned char alu)
- {
-     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
- 
-    if (glamor_priv->gl_flavor == GLAMOR_GL_ES2) {
-+    if (glamor_priv->is_gles) {
-         if (alu != GXcopy)
-             return FALSE;
-         else
-diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
-index a87caec9b..8e8433ff3 100644
--- a/glamor/glamor_priv.h
-+++ b/glamor/glamor_priv.h
-@@ -155,11 +155,6 @@ enum gradient_shader {
- struct glamor_screen_private;
- struct glamor_pixmap_private;
- 
-enum glamor_gl_flavor {
-    GLAMOR_GL_DESKTOP,          // OPENGL API
-    GLAMOR_GL_ES2               // OPENGL ES2.0 API
-};
-
- #define GLAMOR_COMPOSITE_VBO_VERT_CNT (64*1024)
- 
- struct glamor_saved_procs {
-@@ -185,7 +180,7 @@ struct glamor_saved_procs {
- };
- 
- typedef struct glamor_screen_private {
-    enum glamor_gl_flavor gl_flavor;
-+    Bool is_gles;
-     int glsl_version;
-     Bool has_pack_invert;
-     Bool has_fbo_blit;
-diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c
-index 830deb38b..b0a9d07a4 100644
--- a/glamor/glamor_program.c
-+++ b/glamor/glamor_program.c
-@@ -459,7 +459,7 @@ glamor_set_blend(CARD8 op, glamor_program_alpha alpha, PicturePtr dst)
-         break;
-     }
- 
-    if (glamor_priv->gl_flavor != GLAMOR_GL_ES2)
-+    if (!glamor_priv->is_gles)
-         glDisable(GL_COLOR_LOGIC_OP);
- 
-     if (op == PictOpSrc)
-diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
-index 6db6bfbc3..d3859e4d1 100644
--- a/glamor/glamor_render.c
-+++ b/glamor/glamor_render.c
-@@ -1091,7 +1091,7 @@ glamor_composite_set_shader_blend(glamor_screen_private *glamor_priv,
-         }
-     }
- 
-    if (glamor_priv->gl_flavor != GLAMOR_GL_ES2)
-+    if (!glamor_priv->is_gles)
-         glDisable(GL_COLOR_LOGIC_OP);
- 
-     if (op_info->source_blend == GL_ONE && op_info->dest_blend == GL_ZERO) {
-diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
-index 8a147ca7e..cbb808294 100644
--- a/glamor/glamor_utils.h
-+++ b/glamor/glamor_utils.h
-@@ -615,13 +615,13 @@ gl_iformat_for_pixmap(PixmapPtr pixmap)
-         glamor_get_screen_private((pixmap)->drawable.pScreen);
-     glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
- 
-    if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
-+    if (!glamor_priv->is_gles &&
-         ((pixmap)->drawable.depth == 1 || (pixmap)->drawable.depth == 8)) {
-         return glamor_priv->one_channel_format;
-    } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
-+    } else if (!glamor_priv->is_gles &&
-                (pixmap)->drawable.depth == 16 && pixmap_priv->is_cbcr) {
-         return GL_RG;
-    } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
-+    } else if (!glamor_priv->is_gles &&
-                (pixmap)->drawable.depth == 30) {
-         return GL_RGB10_A2;
-     } else {
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0008-glamor-Introduce-a-central-place-for-our-pixmap-form.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0008-glamor-Introduce-a-central-place-for-our-pixmap-form.patch
deleted file mode 100644
index dd82340a..00000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0008-glamor-Introduce-a-central-place-for-our-pixmap-form.patch
+++ /dev/null
@@ -1,669 +0,0 @@
-From b75296bee6ab3578f3a13cfb6de5d77ec02b9047 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Tue, 26 Mar 2019 15:10:49 -0700
-Subject: [PATCH 8/8] glamor: Introduce a central place for our pixmap
- format/type handling.
-We had various helper functions trying to come up with the
-internalformat/format/type/render formats for pixmaps, and it's much
-nicer to just detect what those should be once at startup.  This gives
-us a chance to do the right thing for GLES.
-It also, notably, fixes our format/type for depth 15 and 16 setup for
-desktop GL, so that we actually allocate 16bpp (GL_RGB/565) on most
-drivers instead of 32bpp (GL_RGB/UBYTE).
-GLES still has regressions over desktop (2 regressions in llvmpipe
-XTS, many in rendercheck), but I think this is a good baseline.
-Upstream-Status: Backport
-Signed-off-by: Eric Anholt <eric@anholt.net>
---
- glamor/glamor.c           | 167 ++++++++++++++++++++++++++++++++++++--
- glamor/glamor_fbo.c       |  16 ++--
- glamor/glamor_picture.c   |   7 +-
- glamor/glamor_priv.h      |  22 ++++-
- glamor/glamor_render.c    |   7 +-
- glamor/glamor_spans.c     |  14 ++--
- glamor/glamor_transfer.c  |  56 ++-----------
- glamor/glamor_transfer.h  |   3 -
- glamor/glamor_transform.c |   5 +-
- glamor/glamor_utils.h     |  57 -------------
- 10 files changed, 209 insertions(+), 145 deletions(-)
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index 019edbbb1..3450113e0 100644
--- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -212,7 +212,7 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
-              w <= glamor_priv->glyph_max_dim &&
-              h <= glamor_priv->glyph_max_dim)
-          || (w == 0 && h == 0)
-         || !glamor_check_pixmap_fbo_depth(depth)))
-+         || !glamor_priv->formats[depth].format))
-         return fbCreatePixmap(screen, w, h, depth, usage);
-     else
-         pixmap = fbCreatePixmap(screen, 0, 0, depth, usage);
-@@ -440,6 +440,165 @@ glamor_setup_debug_output(ScreenPtr screen)
-         glEnable(GL_DEBUG_OUTPUT);
- }
- 
-+const struct glamor_format *
-+glamor_format_for_pixmap(PixmapPtr pixmap)
-+{
-+    ScreenPtr pScreen = pixmap->drawable.pScreen;
-+    glamor_screen_private *glamor_priv = glamor_get_screen_private(pScreen);
-+    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
-+
-+    if (pixmap_priv->is_cbcr)
-+        return &glamor_priv->cbcr_format;
-+    else
-+        return &glamor_priv->formats[pixmap->drawable.depth];
-+}
-+
-+static void
-+glamor_add_format(ScreenPtr screen, int depth, CARD32 render_format,
-+                  GLenum internalformat, GLenum format, GLenum type)
-+{
-+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-+    struct glamor_format *f = &glamor_priv->formats[depth];
-+
-+    /* If we're trying to run on GLES, make sure that we get the read
-+     * formats that we're expecting, since glamor_transfer relies on
-+     * them matching to get data back out.  To avoid this limitation, we
-+     * would need to have a more general glReadPixels() path in
-+     * glamor_transfer that re-encoded the bits to the pixel format that
-+     * we intended after.
-+     *
-+     * Note that we can't just create a pixmap because we're in
-+     * screeninit.
-+     */
-+    if (glamor_priv->is_gles) {
-+        unsigned fbo, tex;
-+        int read_format, read_type;
-+        GLenum status;
-+
-+        glGenTextures(1, &tex);
-+        glBindTexture(GL_TEXTURE_2D, tex);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-+        glTexImage2D(GL_TEXTURE_2D, 0, internalformat, 1, 1, 0,
-+                     format, type, NULL);
-+
-+        glGenFramebuffers(1, &fbo);
-+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-+                               GL_TEXTURE_2D, tex, 0);
-+        status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-+        if (status != GL_FRAMEBUFFER_COMPLETE) {
-+            ErrorF("glamor: Test fbo for depth %d incomplete.  "
-+                   "Falling back to software.\n", depth);
-+            glDeleteTextures(1, &tex);
-+            glDeleteFramebuffers(1, &fbo);
-+            return;
-+        }
-+
-+        glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &read_format);
-+        glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &read_type);
-+
-+        glDeleteTextures(1, &tex);
-+        glDeleteFramebuffers(1, &fbo);
-+
-+        if (format != read_format || type != read_type) {
-+            ErrorF("glamor: Implementation returned 0x%x/0x%x read format/type "
-+                   "for depth %d, expected 0x%x/0x%x.  "
-+                   "Falling back to software.\n",
-+                   read_format, read_type, depth, format, type);
-+            return;
-+        }
-+    }
-+
-+    f->depth = depth;
-+    f->render_format = render_format;
-+    f->internalformat = internalformat;
-+    f->format = format;
-+    f->type = type;
-+}
-+
-+/* Set up the GL format/types that glamor will use for the various depths
-+ *
-+ * X11's pixel data doesn't have channels, but to store our data in GL
-+ * we have to pick some sort of format to move X11 pixel data in and
-+ * out with in glamor_transfer.c.  For X11 core operations, other than
-+ * GL logic ops (non-GXcopy GC ops) what the driver chooses internally
-+ * doesn't matter as long as it doesn't drop any bits (we expect them
-+ * to generally expand, if anything).  For Render, we can expect
-+ * clients to tend to render with PictFormats matching our channel
-+ * layouts here since ultimately X11 pixels tend to end up on the
-+ * screen.  The render implementation will fall back to fb if the
-+ * channels don't match.
-+ *
-+ * Note that these formats don't affect what glamor_egl.c or
-+ * Xwayland's EGL layer choose for surfaces exposed through DRI or
-+ * scanout.  For now, those layers need to match what we're choosing
-+ * here, or channels will end up swizzled around.  Similarly, the
-+ * driver's visual masks also need to match what we're doing here.
-+ */
-+static void
-+glamor_setup_formats(ScreenPtr screen)
-+{
-+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-+
-+    /* Prefer r8 textures since they're required by GLES3 and core,
-+     * only falling back to a8 if we can't do them.
-+     */
-+    if (glamor_priv->is_gles || epoxy_has_gl_extension("GL_ARB_texture_rg")) {
-+        glamor_add_format(screen, 8, PICT_a8,
-+                          GL_R8, GL_RED, GL_UNSIGNED_BYTE);
-+    } else {
-+        glamor_add_format(screen, 8, PICT_a8,
-+                          GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE);
-+    }
-+
-+    if (glamor_priv->is_gles) {
-+        /* For 15bpp, GLES supports format/type RGBA/5551, rather than
-+         * bgra/1555_rev.  GL_EXT_bgra lets the impl say the color
-+         * read format/type is bgra/1555 even if we had to create it
-+         * with rgba/5551, with Mesa does.  That means we can't use
-+         * the same format/type for TexSubImage and readpixels.
-+         *
-+         * Instead, just store 16 bits using the trusted 565 path, and
-+         * disable render accel for now.
-+         */
-+        glamor_add_format(screen, 15, PICT_x1r5g5b5,
-+                          GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
-+    } else {
-+        glamor_add_format(screen, 15, PICT_x1r5g5b5,
-+                          GL_RGBA, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV);
-+    }
-+
-+    glamor_add_format(screen, 16, PICT_r5g6b5,
-+                      GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
-+
-+    if (glamor_priv->is_gles) {
-+        assert(X_BYTE_ORDER == X_LITTLE_ENDIAN);
-+        glamor_add_format(screen, 24, PICT_x8b8g8r8,
-+                          GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE);
-+        glamor_add_format(screen, 32, PICT_a8b8g8r8,
-+                          GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE);
-+    } else {
-+        glamor_add_format(screen, 24, PICT_x8r8g8b8,
-+                          GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV);
-+        glamor_add_format(screen, 32, PICT_a8r8g8b8,
-+                          GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV);
-+    }
-+
-+    if (glamor_priv->is_gles) {
-+        glamor_add_format(screen, 30, PICT_x2b10g10r10,
-+                          GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV);
-+    } else {
-+        glamor_add_format(screen, 30, PICT_x2r10g10b10,
-+                          GL_RGB10_A2, GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV);
-+    }
-+
-+    glamor_priv->cbcr_format.depth = 16;
-+    glamor_priv->cbcr_format.internalformat = GL_RG8;
-+    glamor_priv->cbcr_format.format = GL_RG;
-+    glamor_priv->cbcr_format.type = GL_UNSIGNED_BYTE;
-+}
-+
- /** Set up glamor for an already-configured GL context. */
- Bool
- glamor_init(ScreenPtr screen, unsigned int flags)
-@@ -665,11 +824,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
-         (epoxy_has_gl_extension("GL_ARB_texture_swizzle") ||
-          (glamor_priv->is_gles && gl_version >= 30));
- 
-    glamor_priv->one_channel_format = GL_ALPHA;
-    if (epoxy_has_gl_extension("GL_ARB_texture_rg") &&
-        glamor_priv->has_texture_swizzle) {
-        glamor_priv->one_channel_format = GL_RED;
-    }
-+    glamor_setup_formats(screen);
- 
-     glamor_set_debug_level(&glamor_debug_level);
- 
-diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
-index 75f7e2baa..dfb3f754d 100644
--- a/glamor/glamor_fbo.c
-+++ b/glamor/glamor_fbo.c
-@@ -97,7 +97,7 @@ glamor_pixmap_fbo *
- glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
-                            PixmapPtr pixmap, int w, int h, GLint tex, int flag)
- {
-    GLenum format = gl_iformat_for_pixmap(pixmap);
-+    const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
-     glamor_pixmap_fbo *fbo;
- 
-     fbo = calloc(1, sizeof(*fbo));
-@@ -107,7 +107,7 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
-     fbo->tex = tex;
-     fbo->width = w;
-     fbo->height = h;
-    fbo->is_red = format == GL_RED;
-+    fbo->is_red = f->format == GL_RED;
- 
-     if (flag != GLAMOR_CREATE_FBO_NO_FBO) {
-         if (glamor_pixmap_ensure_fb(glamor_priv, fbo) != 0) {
-@@ -123,23 +123,19 @@ static int
- _glamor_create_tex(glamor_screen_private *glamor_priv,
-                    PixmapPtr pixmap, int w, int h)
- {
-    GLenum iformat = gl_iformat_for_pixmap(pixmap);
-    GLenum format = iformat;
-+    const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
-     unsigned int tex;
- 
-    if (format == GL_RGB10_A2)
-        format = GL_RGBA;
-
-     glamor_make_current(glamor_priv);
-     glGenTextures(1, &tex);
-     glBindTexture(GL_TEXTURE_2D, tex);
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    if (format == glamor_priv->one_channel_format && format == GL_RED)
-+    if (f->format == GL_RED)
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
-     glamor_priv->suppress_gl_out_of_memory_logging = true;
-    glTexImage2D(GL_TEXTURE_2D, 0, iformat, w, h, 0,
-                 format, GL_UNSIGNED_BYTE, NULL);
-+    glTexImage2D(GL_TEXTURE_2D, 0, f->internalformat, w, h, 0,
-+                 f->format, f->type, NULL);
-     glamor_priv->suppress_gl_out_of_memory_logging = false;
- 
-     if (glGetError() == GL_OUT_OF_MEMORY) {
-diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
-index ed2decc83..33b3bebd9 100644
--- a/glamor/glamor_picture.c
-+++ b/glamor/glamor_picture.c
-@@ -83,7 +83,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
- 
-     switch (format) {
-     case PICT_a1:
-        *tex_format = glamor_priv->one_channel_format;
-+        *tex_format = glamor_priv->formats[1].format;
-         *tex_type = GL_UNSIGNED_BYTE;
-         *temp_format = PICT_a8;
-         break;
-@@ -195,7 +195,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
-         break;
- 
-     case PICT_a8:
-        *tex_format = glamor_priv->one_channel_format;
-+        *tex_format = glamor_priv->formats[8].format;
-         *tex_type = GL_UNSIGNED_BYTE;
-         break;
- 
-@@ -286,6 +286,7 @@ glamor_upload_picture_to_texture(PicturePtr picture)
-     Bool ret = TRUE;
-     Bool needs_swizzle;
-     pixman_image_t *converted_image = NULL;
-+    const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
- 
-     assert(glamor_pixmap_is_memory(pixmap));
-     assert(!pixmap_priv->fbo);
-@@ -336,7 +337,7 @@ glamor_upload_picture_to_texture(PicturePtr picture)
-     }
- 
-     if (!glamor_priv->is_gles)
-        iformat = gl_iformat_for_pixmap(pixmap);
-+        iformat = f->internalformat;
-     else
-         iformat = format;
- 
-diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
-index 8e8433ff3..b8e2b932e 100644
--- a/glamor/glamor_priv.h
-+++ b/glamor/glamor_priv.h
-@@ -157,6 +157,21 @@ struct glamor_pixmap_private;
- 
- #define GLAMOR_COMPOSITE_VBO_VERT_CNT (64*1024)
- 
-+struct glamor_format {
-+    /** X Server's "depth" value */
-+    int depth;
-+    /** GL internalformat for creating textures of this type */
-+    GLenum internalformat;
-+    /** GL format transferring pixels in/out of textures of this type. */
-+    GLenum format;
-+    /** GL type transferring pixels in/out of textures of this type. */
-+    GLenum type;
-+    /* Render PICT_* matching GL's channel layout for pixels
-+     * transferred using format/type.
-+     */
-+    CARD32 render_format;
-+};
-+
- struct glamor_saved_procs {
-     CloseScreenProcPtr close_screen;
-     CreateGCProcPtr create_gc;
-@@ -199,7 +214,8 @@ typedef struct glamor_screen_private {
-     Bool can_copyplane;
-     int max_fbo_size;
- 
-    GLuint one_channel_format;
-+    struct glamor_format formats[33];
-+    struct glamor_format cbcr_format;
- 
-     /* glamor point shader */
-     glamor_program point_prog;
-@@ -537,6 +553,8 @@ void glamor_pixmap_destroy_fbo(PixmapPtr pixmap);
- Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap);
- void glamor_pixmap_clear_fbo(glamor_screen_private *glamor_priv, glamor_pixmap_fbo *fbo);
- 
-+const struct glamor_format *glamor_format_for_pixmap(PixmapPtr pixmap);
-+
- /* Return whether 'picture' is alpha-only */
- static inline Bool glamor_picture_is_alpha(PicturePtr picture)
- {
-@@ -549,7 +567,7 @@ glamor_picture_red_is_alpha(PicturePtr picture)
- {
-     /* True when the picture is alpha only and the screen is using GL_RED for alpha pictures */
-     return glamor_picture_is_alpha(picture) &&
-        glamor_get_screen_private(picture->pDrawable->pScreen)->one_channel_format == GL_RED;
-+        glamor_get_screen_private(picture->pDrawable->pScreen)->formats[8].format == GL_RED;
- }
- 
- void glamor_bind_texture(glamor_screen_private *glamor_priv,
-diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
-index d3859e4d1..a8dc3924b 100644
--- a/glamor/glamor_render.c
-+++ b/glamor/glamor_render.c
-@@ -772,12 +772,15 @@ static Bool
- glamor_render_format_is_supported(PicturePtr picture)
- {
-     PictFormatShort storage_format;
-+    glamor_screen_private *glamor_priv;
- 
-     /* Source-only pictures should always work */
-     if (!picture->pDrawable)
-         return TRUE;
- 
-    storage_format = format_for_depth(picture->pDrawable->depth);
-+    glamor_priv = glamor_get_screen_private(picture->pDrawable->pScreen);
-+    storage_format =
-+        glamor_priv->formats[picture->pDrawable->depth].render_format;
- 
-     switch (picture->format) {
-     case PICT_x2r10g10b10:
-@@ -898,7 +901,7 @@ glamor_composite_choose_shader(CARD8 op,
-     }
- 
-     if (dest_pixmap->drawable.bitsPerPixel <= 8 &&
-        glamor_priv->one_channel_format == GL_RED) {
-+        glamor_priv->formats[8].format == GL_RED) {
-         key.dest_swizzle = SHADER_DEST_SWIZZLE_ALPHA_TO_RED;
-     } else {
-         key.dest_swizzle = SHADER_DEST_SWIZZLE_DEFAULT;
-diff --git a/glamor/glamor_spans.c b/glamor/glamor_spans.c
-index b3c028d67..b5f297d2f 100644
--- a/glamor/glamor_spans.c
-+++ b/glamor/glamor_spans.c
-@@ -187,9 +187,8 @@ glamor_get_spans_gl(DrawablePtr drawable, int wmax,
-     int box_index;
-     int n;
-     char *d;
-    GLenum type;
-    GLenum format;
-     int off_x, off_y;
-+    const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
- 
-     pixmap_priv = glamor_get_pixmap_private(pixmap);
-     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
-@@ -197,8 +196,6 @@ glamor_get_spans_gl(DrawablePtr drawable, int wmax,
- 
-     glamor_get_drawable_deltas(drawable, pixmap, &off_x, &off_y);
- 
-    glamor_format_for_pixmap(pixmap, &format, &type);
-
-     glamor_make_current(glamor_priv);
- 
-     glamor_pixmap_loop(pixmap_priv, box_index) {
-@@ -234,7 +231,8 @@ glamor_get_spans_gl(DrawablePtr drawable, int wmax,
-             if (y >= box->y2)
-                 continue;
- 
-            glReadPixels(x1 - box->x1, y - box->y1, x2 - x1, 1, format, type, l);
-+            glReadPixels(x1 - box->x1, y - box->y1, x2 - x1, 1,
-+                         f->format, f->type, l);
-         }
-     }
- 
-@@ -269,11 +267,10 @@ glamor_set_spans_gl(DrawablePtr drawable, GCPtr gc, char *src,
-     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-     PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
-     glamor_pixmap_private *pixmap_priv;
-+    const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
-     int box_index;
-     int n;
-     char *s;
-    GLenum type;
-    GLenum format;
-     int off_x, off_y;
- 
-     pixmap_priv = glamor_get_pixmap_private(pixmap);
-@@ -287,7 +284,6 @@ glamor_set_spans_gl(DrawablePtr drawable, GCPtr gc, char *src,
-         goto bail;
- 
-     glamor_get_drawable_deltas(drawable, pixmap, &off_x, &off_y);
-    glamor_format_for_pixmap(pixmap, &format, &type);
- 
-     glamor_make_current(glamor_priv);
- 
-@@ -348,7 +344,7 @@ glamor_set_spans_gl(DrawablePtr drawable, GCPtr gc, char *src,
- 
-                 glTexSubImage2D(GL_TEXTURE_2D, 0,
-                                 x1 - box->x1, y1 - box->y1, x2 - x1, 1,
-                                format, type,
-+                                f->format, f->type,
-                                 l);
-             }
-             s += PixmapBytePad(w, drawable->depth);
-diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c
-index 215752d7b..e706e0fb4 100644
--- a/glamor/glamor_transfer.c
-+++ b/glamor/glamor_transfer.c
-@@ -23,44 +23,6 @@
- #include "glamor_priv.h"
- #include "glamor_transfer.h"
- 
-/* XXX a kludge for now */
-void
-glamor_format_for_pixmap(PixmapPtr pixmap, GLenum *format, GLenum *type)
-{
-    glamor_pixmap_private       *priv = glamor_get_pixmap_private(pixmap);
-    switch (pixmap->drawable.depth) {
-    case 24:
-    case 32:
-        *format = GL_BGRA;
-        *type = GL_UNSIGNED_INT_8_8_8_8_REV;
-        break;
-    case 30:
-        *format = GL_BGRA;
-        *type = GL_UNSIGNED_INT_2_10_10_10_REV;
-        break;
-    case 16:
-        if (priv->is_cbcr) {
-          *format = GL_RG;
-          *type = GL_UNSIGNED_BYTE;
-        } else {
-          *format = GL_RGB;
-          *type = GL_UNSIGNED_SHORT_5_6_5;
-        }
-        break;
-    case 15:
-        *format = GL_BGRA;
-        *type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-        break;
-    case 8:
-        *format = glamor_get_screen_private(pixmap->drawable.pScreen)->one_channel_format;
-        *type = GL_UNSIGNED_BYTE;
-        break;
-    default:
-        FatalError("Invalid pixmap depth %d\n", pixmap->drawable.depth);
-        break;
-    }
-}
-
- /*
-  * Write a region of bits into a pixmap
-  */
-@@ -75,10 +37,7 @@ glamor_upload_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
-     glamor_pixmap_private       *priv = glamor_get_pixmap_private(pixmap);
-     int                         box_index;
-     int                         bytes_per_pixel = pixmap->drawable.bitsPerPixel >> 3;
-    GLenum                      type;
-    GLenum                      format;
-
-    glamor_format_for_pixmap(pixmap, &format, &type);
-+    const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
- 
-     glamor_make_current(glamor_priv);
- 
-@@ -116,14 +75,14 @@ glamor_upload_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
-                 glTexSubImage2D(GL_TEXTURE_2D, 0,
-                                 x1 - box->x1, y1 - box->y1,
-                                 x2 - x1, y2 - y1,
-                                format, type,
-+                                f->format, f->type,
-                                 bits + ofs);
-             } else {
-                 for (; y1 < y2; y1++, ofs += byte_stride)
-                     glTexSubImage2D(GL_TEXTURE_2D, 0,
-                                     x1 - box->x1, y1 - box->y1,
-                                     x2 - x1, 1,
-                                    format, type,
-+                                    f->format, f->type,
-                                     bits + ofs);
-             }
-         }
-@@ -178,10 +137,7 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
-     glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap);
-     int box_index;
-     int bytes_per_pixel = pixmap->drawable.bitsPerPixel >> 3;
-    GLenum type;
-    GLenum format;
-
-    glamor_format_for_pixmap(pixmap, &format, &type);
-+    const struct glamor_format *f = glamor_format_for_pixmap(pixmap);
- 
-     glamor_make_current(glamor_priv);
- 
-@@ -216,10 +172,10 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
- 
-             if (glamor_priv->has_pack_subimage ||
-                 x2 - x1 == byte_stride / bytes_per_pixel) {
-                glReadPixels(x1 - box->x1, y1 - box->y1, x2 - x1, y2 - y1, format, type, bits + ofs);
-+                glReadPixels(x1 - box->x1, y1 - box->y1, x2 - x1, y2 - y1, f->format, f->type, bits + ofs);
-             } else {
-                 for (; y1 < y2; y1++, ofs += byte_stride)
-                    glReadPixels(x1 - box->x1, y1 - box->y1, x2 - x1, 1, format, type, bits + ofs);
-+                    glReadPixels(x1 - box->x1, y1 - box->y1, x2 - x1, 1, f->format, f->type, bits + ofs);
-             }
-         }
-     }
-diff --git a/glamor/glamor_transfer.h b/glamor/glamor_transfer.h
-index de8186a70..a6137b3ff 100644
--- a/glamor/glamor_transfer.h
-+++ b/glamor/glamor_transfer.h
-@@ -23,9 +23,6 @@
- #ifndef _GLAMOR_TRANSFER_H_
- #define _GLAMOR_TRANSFER_H_
- 
-void
-glamor_format_for_pixmap(PixmapPtr pixmap, GLenum *format, GLenum *type);
-
- void
- glamor_upload_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
-                     int dx_src, int dy_src,
-diff --git a/glamor/glamor_transform.c b/glamor/glamor_transform.c
-index 2d5a634a8..348d00be1 100644
--- a/glamor/glamor_transform.c
-+++ b/glamor/glamor_transform.c
-@@ -121,10 +121,9 @@ glamor_set_color_depth(ScreenPtr      pScreen,
- 
-     glamor_get_rgba_from_pixel(pixel,
-                                &color[0], &color[1], &color[2], &color[3],
-                               format_for_depth(depth));
-+                               glamor_priv->formats[depth].render_format);
- 
-    if ((depth == 1 || depth == 8) &&
-        glamor_priv->one_channel_format == GL_RED)
-+    if ((depth <= 8) && glamor_priv->formats[8].format == GL_RED)
-       color[0] = color[3];
- 
-     glUniform4fv(uniform, 1, color);
-diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
-index cbb808294..651faf2fe 100644
--- a/glamor/glamor_utils.h
-+++ b/glamor/glamor_utils.h
-@@ -570,65 +570,8 @@
-                                                     && (_w_) <= _glamor_->max_fbo_size  \
-                                                     && (_h_) <= _glamor_->max_fbo_size)
- 
-/* For 1bpp pixmap, we don't store it as texture. */
-#define glamor_check_pixmap_fbo_depth(_depth_) (                       \
-                                               _depth_ == 8            \
-                                               || _depth_ == 15        \
-                                               || _depth_ == 16        \
-                                               || _depth_ == 24        \
-                                               || _depth_ == 30        \
-                                               || _depth_ == 32)
-
- #define GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)    (pixmap_priv->gl_fbo == GLAMOR_FBO_NORMAL)
- 
-/**
- * Borrow from uxa.
- */
-static inline CARD32
-format_for_depth(int depth)
-{
-    switch (depth) {
-    case 1:
-        return PICT_a1;
-    case 4:
-        return PICT_a4;
-    case 8:
-        return PICT_a8;
-    case 15:
-        return PICT_x1r5g5b5;
-    case 16:
-        return PICT_r5g6b5;
-    default:
-    case 24:
-        return PICT_x8r8g8b8;
-    case 30:
-        return PICT_x2r10g10b10;
-    case 32:
-        return PICT_a8r8g8b8;
-    }
-}
-
-static inline GLenum
-gl_iformat_for_pixmap(PixmapPtr pixmap)
-{
-    glamor_screen_private *glamor_priv =
-        glamor_get_screen_private((pixmap)->drawable.pScreen);
-    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
-
-    if (!glamor_priv->is_gles &&
-        ((pixmap)->drawable.depth == 1 || (pixmap)->drawable.depth == 8)) {
-        return glamor_priv->one_channel_format;
-    } else if (!glamor_priv->is_gles &&
-               (pixmap)->drawable.depth == 16 && pixmap_priv->is_cbcr) {
-        return GL_RG;
-    } else if (!glamor_priv->is_gles &&
-               (pixmap)->drawable.depth == 30) {
-        return GL_RGB10_A2;
-    } else {
-        return GL_RGBA;
-    }
-}
-
- #define REVERT_NONE                    0
- #define REVERT_NORMAL                  1
- #define REVERT_UPLOADING_A1            3
-- 
-2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index c956245b..161df049 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -1,21 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch"
-SRC_URI:append:imxgpu = " \
-    file://0003-Remove-check-for-useSIGIO-option.patch \
-    file://0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch \
-    file://0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch \
-    file://0001-prefer-to-use-GLES2-for-glamor-EGL-config.patch \
-    file://0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch \
-    file://0001-xfree86-define-FOURCC_NV12-and-XVIMAGE_NV12.patch \
-    file://0002-glamor-add-support-for-GL_RG.patch \
-    file://0003-glamor-add-support-for-NV12-in-Xv.patch \
-    file://0004-glamor-Remove-unused-format_for_pixmap-helper.patch \
-    file://0005-glamor-Stop-trying-to-store-the-pixmap-s-format-in-g.patch \
-    file://0006-glamor-Plumb-the-pixmap-through-fbo-creation-instead.patch \
-    file://0007-glamor-Switch-the-gl_flavor-to-a-boolean-is_gles.patch \
-    file://0008-glamor-Introduce-a-central-place-for-our-pixmap-form.patch \
-"
 IMX_OPENGL_PKGCONFIGS_REMOVE        = ""
 IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend
index 69063121..f2141f4f 100644
--- a/recipes-graphics/xwayland/xwayland_%.bbappend
+++ b/recipes-graphics/xwayland/xwayland_%.bbappend
@@ -10,3 +10,10 @@ OPENGL_PKGCONFIGS_REMOVE_IMXGPU             = ""
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx"
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx"
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx"
+# 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"
+RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat"
diff --git a/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig
index 74dc82cb..85e72abc 100644
--- a/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig
@@ -1,101 +1,63 @@
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
-CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BPF_JIT=y
 CONFIG_PREEMPT=y
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_NUMA_BALANCING=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
 CONFIG_MEMCG=y
-CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
 CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
+CONFIG_NAMESPACES=y
-CONFIG_CGROUP_PERF=y
 CONFIG_USER_NS=y
-CONFIG_SCHED_AUTOGROUP=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
+CONFIG_PERF_EVENTS=y
+# CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_ARCH_LAYERSCAPE=y
-CONFIG_ARCH_KEEMBAY=y
 CONFIG_ARCH_MXC=y
-CONFIG_ARCH_S32=y
+CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_S32V234=y
+CONFIG_SOC_IMX6SL=y
-CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SOC_IMX6SLL=y
-CONFIG_SCHED_MC=y
+CONFIG_SOC_IMX6SX=y
-CONFIG_SCHED_SMT=y
+CONFIG_SOC_IMX6UL=y
-CONFIG_NUMA=y
+CONFIG_SOC_IMX7D=y
-CONFIG_KEXEC=y
+CONFIG_SOC_IMX7ULP=y
-CONFIG_KEXEC_FILE=y
+CONFIG_SMP=y
-CONFIG_CRASH_DUMP=y
+CONFIG_VMSPLIT_2G=y
-CONFIG_XEN=y
+CONFIG_ARM_PSCI=y
+CONFIG_HIGHMEM=y
 CONFIG_FORCE_MAX_ZONEORDER=14
-CONFIG_COMPAT=y
+CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
-CONFIG_RANDOMIZE_BASE=y
+CONFIG_KEXEC=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_TEST_SUSPEND=y
-CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_ARM_CPUIDLE=y
-CONFIG_ARM_PSCI_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
-CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ARM_IMX6Q_CPUFREQ=y
-CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_IMX_CPUFREQ_DT=y
-CONFIG_ARM_SCMI_CPUFREQ=y
+CONFIG_CPU_IDLE=y
-CONFIG_QORIQ_CPUFREQ=y
+CONFIG_ARM_CPUIDLE=y
-CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_PSCI_CPUIDLE=y
-CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_VFP=y
-CONFIG_QCOM_SCM=m
+CONFIG_NEON=y
-CONFIG_EFI_CAPSULE_LOADER=y
+CONFIG_PM_DEBUG=y
-CONFIG_IMX_DSP=y
+CONFIG_PM_TEST_SUSPEND=y
-CONFIG_IMX_SCU=y
+CONFIG_KPROBES=y
-CONFIG_IMX_SCU_PD=y
-CONFIG_ACPI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_AES_ARM64_BS=m
-CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_KSM=y
+CONFIG_BINFMT_MISC=m
-CONFIG_MEMORY_FAILURE=y
+CONFIG_CMA=y
-CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -103,55 +65,11 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_BRIDGE=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_NET_DSA=m
 CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_LLC2=y
-CONFIG_NET_SCHED=y
+CONFIG_CAN=y
-CONFIG_NET_SCH_MULTIQ=m
+CONFIG_CAN_FLEXCAN=y
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-CONFIG_NET_SCH_TAPRIO=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_GATE=m
-CONFIG_TSN=y
-CONFIG_QRTR=m
-CONFIG_QRTR_SMD=m
-CONFIG_QRTR_TUN=m
-CONFIG_NET_PKTGEN=m
-CONFIG_CAN=m
-CONFIG_CAN_FLEXCAN=m
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
@@ -159,64 +77,38 @@ CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
-CONFIG_BT_LEDS=y
+CONFIG_BT_HCIBTUSB=y
-# CONFIG_BT_DEBUGFS is not set
-CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIVHCI=y
+CONFIG_BT_MRVL=y
+CONFIG_BT_MRVL_SDIO=y
 CONFIG_CFG80211=y
 CONFIG_NL80211_TESTMODE=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=y
-CONFIG_MAC80211_LEDS=y
-CONFIG_NET_9P=y
-CONFIG_NET_9P_VIRTIO=y
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_MSI=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PASID=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCI_XGENE=y
-CONFIG_PCIE_ALTERA=y
-CONFIG_PCIE_ALTERA_MSI=y
-CONFIG_PCI_HOST_THUNDER_PEM=y
-CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_IMX6_HOST=y
 CONFIG_PCI_IMX6_EP=y
-CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCI_HISI=y
-CONFIG_PCIE_KIRIN=y
-CONFIG_PCI_MESON=m
-CONFIG_PCIE_LAYERSCAPE_GEN4=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 CONFIG_PCI_EPF_TEST=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_BRCMSTB_GISB_ARB=y
+CONFIG_IMX_WEIM=y
-CONFIG_SIMPLE_PM_BUS=y
+CONFIG_CONNECTOR=y
-CONFIG_VEXPRESS_CONFIG=y
-CONFIG_FSL_MC_UAPI_SUPPORT=y
-CONFIG_GNSS=m
-CONFIG_GNSS_MTK_SERIAL=m
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI_STAA=y
@@ -225,504 +117,273 @@ CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_SST25L=y
 CONFIG_MTD_RAW_NAND=y
-CONFIG_MTD_NAND_DENALI_DT=y
 CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_NAND_FSL_IFC=y
+CONFIG_MTD_NAND_MXC=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_OF_OVERLAY=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
-CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_VIRTIO_BLK=y
-CONFIG_BLK_DEV_NVME=y
-CONFIG_SRAM=y
 CONFIG_PCI_ENDPOINT_TEST=y
-CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_AT25=y
-CONFIG_UACCE=m
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_SAS_ATA=y
+# CONFIG_BLK_DEV_BSG is not set
-CONFIG_SCSI_HISI_SAS=y
+CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_HISI_SAS_PCI=y
+CONFIG_SCSI_LOGGING=y
-CONFIG_MEGARAID_SAS=y
+CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_UFSHCD=y
-CONFIG_SCSI_UFSHCD_PLATFORM=y
 CONFIG_ATA=y
-CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_IMX=y
-CONFIG_AHCI_CEVA=y
+CONFIG_PATA_IMX=y
-CONFIG_AHCI_XGENE=y
-CONFIG_AHCI_QORIQ=y
-CONFIG_SATA_SIL24=y
-CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_OF_PLATFORM=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
 CONFIG_NETDEVICES=y
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
 CONFIG_TUN=y
-CONFIG_VETH=m
+# CONFIG_NET_VENDOR_BROADCOM is not set
-CONFIG_VIRTIO_NET=y
+CONFIG_CS89x0_PLATFORM=y
-CONFIG_NET_DSA_MSCC_FELIX=m
+# CONFIG_NET_VENDOR_FARADAY is not set
-CONFIG_AMD_XGBE=y
+# CONFIG_NET_VENDOR_INTEL is not set
-CONFIG_ATL1C=m
+# CONFIG_NET_VENDOR_MARVELL is not set
-CONFIG_BCMGENET=m
+# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_BNX2X=m
+# CONFIG_NET_VENDOR_MICROCHIP is not set
-CONFIG_MACB=y
+# CONFIG_NET_VENDOR_NATSEMI is not set
-CONFIG_THUNDER_NIC_PF=y
+# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_FEC=y
-CONFIG_FEC_UIO=y
-CONFIG_FSL_FMAN=y
-CONFIG_FSL_DPAA_ETH=y
-CONFIG_FSL_DPAA2_ETH=y
-CONFIG_FSL_DPAA2_MAC=y
-CONFIG_FSL_DPAA2_SWITCH=y
-CONFIG_FSL_ENETC=y
-CONFIG_FSL_ENETC_VF=y
-CONFIG_FSL_ENETC_QOS=y
-CONFIG_ENETC_TSN=y
-CONFIG_HIX5HD2_GMAC=y
-CONFIG_HNS_DSAF=y
-CONFIG_HNS_ENET=y
-CONFIG_HNS3=y
-CONFIG_HNS3_HCLGE=y
-CONFIG_HNS3_ENET=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
-CONFIG_IGB=y
-CONFIG_IGBVF=y
-CONFIG_MVMDIO=y
-CONFIG_SKY2=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MSCC_OCELOT_SWITCH=y
-CONFIG_QCOM_EMAC=m
-CONFIG_RMNET=m
 CONFIG_SMC91X=y
+CONFIG_SMC911X=y
 CONFIG_SMSC911X=y
-CONFIG_STMMAC_ETH=y
+# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_DWMAC_GENERIC=m
-CONFIG_AQUANTIA_PHY=y
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM54140_PHY=m
-CONFIG_INPHI_PHY=y
-CONFIG_MARVELL_PHY=m
-CONFIG_MARVELL_10G_PHY=m
 CONFIG_MICREL_PHY=y
-CONFIG_MICROSEMI_PHY=y
-CONFIG_NXP_TJA11XX_PHY=y
 CONFIG_AT803X_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_ROCKCHIP_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_MDIO_BITBANG=y
-CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=y
-CONFIG_USB_LAN78XX=m
+CONFIG_USB_LAN78XX=y
 CONFIG_USB_USBNET=y
-CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_SMSC95XX=y
-CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_MCS7830=y
-CONFIG_USB_NET_CDC_NCM=m
+CONFIG_ATH10K=m
-CONFIG_USB_NET_DM9601=m
+CONFIG_ATH10K_SDIO=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_NET_ZAURUS=m
 CONFIG_HOSTAP=y
+CONFIG_WL12XX=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE_SDIO=m
-CONFIG_XEN_NETDEV_BACKEND=m
+# CONFIG_WILINK_PLATFORM_DATA is not set
-CONFIG_IVSHMEM_NET=y
 CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_ADC=m
+CONFIG_INPUT_EVBUG=m
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_RPMSG=y
-CONFIG_KEYBOARD_SNVS_PWRKEY=y
+CONFIG_KEYBOARD_IMX=y
-CONFIG_KEYBOARD_IMX_SC_PWRKEY=y
+CONFIG_MOUSE_PS2=m
-CONFIG_KEYBOARD_CROS_EC=y
+CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_ADS7846=y
-CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_AD7879=y
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=y
-CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=y
+CONFIG_TOUCHSCREEN_DA9052=y
+CONFIG_TOUCHSCREEN_EGALAX=y
+CONFIG_TOUCHSCREEN_ELAN_TS=y
+CONFIG_TOUCHSCREEN_GOODIX=y
+CONFIG_TOUCHSCREEN_ILI210X=y
+CONFIG_TOUCHSCREEN_MAX11801=y
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
+CONFIG_TOUCHSCREEN_EDT_FT5X06=y
+CONFIG_TOUCHSCREEN_MC13783=y
+CONFIG_TOUCHSCREEN_TSC2004=y
+CONFIG_TOUCHSCREEN_TSC2007=y
+CONFIG_TOUCHSCREEN_STMPE=y
+CONFIG_TOUCHSCREEN_SX8654=y
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
+CONFIG_TOUCHSCREEN_FTS=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_MMA8450=y
-# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_AMBAKMI=y
+# CONFIG_LEGACY_PTYS is not set
-CONFIG_LEGACY_PTY_COUNT=16
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DW=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_XILINX_PS_UART=y
-CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_SERIAL_FSL_LINFLEXUART=y
-CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
 CONFIG_SERIAL_DEV_BUS=y
-CONFIG_VIRTIO_CONSOLE=y
+# CONFIG_I2C_COMPAT is not set
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_TCG_TPM=y
-CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_MUX_GPIO=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_GPIO=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_GPIO=y
 CONFIG_I2C_IMX=y
 CONFIG_I2C_IMX_LPI2C=y
-CONFIG_I2C_RK3X=y
-CONFIG_I2C_RPBUS=y
-CONFIG_I2C_CROS_EC_TUNNEL=y
-CONFIG_XEN_I2C_BACKEND=y
-CONFIG_I3C=y
-CONFIG_SVC_I3C_MASTER=y
 CONFIG_SPI=y
-CONFIG_SPI_CADENCE_QUADSPI=y
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_DMA=y
-CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_FSL_LPSPI=y
 CONFIG_SPI_FSL_QUADSPI=y
-CONFIG_SPI_NXP_FLEXSPI=y
+CONFIG_SPI_GPIO=y
 CONFIG_SPI_IMX=y
-CONFIG_SPI_FSL_DSPI=y
-CONFIG_SPI_PL022=y
-CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPI_SLAVE=y
 CONFIG_SPI_SLAVE_TIME=y
 CONFIG_SPI_SLAVE_SYSTEM_CONTROL=y
-CONFIG_SPMI=y
+CONFIG_GPIO_SYSFS=y
-CONFIG_PINCTRL_SINGLE=y
+CONFIG_GPIO_MXC=y
-CONFIG_PINCTRL_MAX77620=y
+CONFIG_GPIO_SIOX=m
-CONFIG_PINCTRL_IMX8MM=y
-CONFIG_PINCTRL_IMX8MN=y
-CONFIG_PINCTRL_IMX8MP=y
-CONFIG_PINCTRL_IMX8MQ=y
-CONFIG_PINCTRL_IMX8QM=y
-CONFIG_PINCTRL_IMX8QXP=y
-CONFIG_PINCTRL_IMX8DXL=y
-CONFIG_PINCTRL_IMX8ULP=y
-CONFIG_PINCTRL_S32V234=y
-CONFIG_GPIO_ALTERA=m
-CONFIG_GPIO_DWAPB=y
-CONFIG_GPIO_MB86S7X=y
-CONFIG_GPIO_MPC8XXX=y
-CONFIG_GPIO_PL061=y
 CONFIG_GPIO_IMX_RPMSG=y
-CONFIG_GPIO_WCD934X=m
-CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_MAX732X=y
 CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_STMPE=y
-CONFIG_GPIO_MAX77620=y
+CONFIG_GPIO_74X164=y
-CONFIG_GPIO_SL28CPLD=m
+CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_BRCMSTB=y
-CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
-CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_BATTERY_SBS=m
+CONFIG_POWER_SUPPLY=y
-CONFIG_BATTERY_BQ27XXX=y
+CONFIG_SABRESD_MAX8903=y
-CONFIG_BATTERY_MAX17042=m
+CONFIG_RN5T618_POWER=m
-CONFIG_CHARGER_BQ25890=m
+CONFIG_SENSORS_MC13783_ADC=y
-CONFIG_CHARGER_BQ25980=m
+CONFIG_SENSORS_GPIO_FAN=y
-CONFIG_SENSORS_ARM_SCMI=y
+CONFIG_SENSORS_IIO_HWMON=y
-CONFIG_SENSORS_ARM_SCPI=y
+CONFIG_SENSORS_MAX17135=y
-CONFIG_SENSORS_FP9931=y
+CONFIG_THERMAL=y
-CONFIG_SENSORS_LM90=m
+CONFIG_THERMAL_STATISTICS=y
-CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SL28CPLD=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
 CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
-CONFIG_THERMAL_EMULATION=y
+CONFIG_IMX_THERMAL=y
-CONFIG_IMX_SC_THERMAL=y
-CONFIG_IMX8MM_THERMAL=y
 CONFIG_DEVICE_THERMAL=y
-CONFIG_QORIQ_THERMAL=y
 CONFIG_WATCHDOG=y
-CONFIG_SL28CPLD_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
-CONFIG_ARM_SP805_WATCHDOG=y
+CONFIG_DA9062_WATCHDOG=y
-CONFIG_ARM_SBSA_WATCHDOG=y
+CONFIG_RN5T618_WATCHDOG=y
-CONFIG_DW_WATCHDOG=y
 CONFIG_IMX2_WDT=y
-CONFIG_IMX_SC_WDT=y
 CONFIG_IMX7ULP_WDT=y
-CONFIG_ARM_SMC_WATCHDOG=y
+CONFIG_MFD_DA9052_I2C=y
-CONFIG_XEN_WDT=y
+CONFIG_MFD_DA9062=y
-CONFIG_MFD_BD9571MWV=y
+CONFIG_MFD_DA9063=y
-CONFIG_MFD_AXP20X_I2C=y
+CONFIG_MFD_MC13XXX_SPI=y
-CONFIG_MFD_IMX_MIX=y
+CONFIG_MFD_MC13XXX_I2C=y
-CONFIG_MFD_HI6421_PMIC=y
+CONFIG_MFD_MAX17135=y
-CONFIG_MFD_FP9931=y
+CONFIG_MFD_RN5T618=y
-CONFIG_MFD_MAX77620=y
+CONFIG_MFD_SI476X_CORE=y
-CONFIG_MFD_MT6397=y
+CONFIG_MFD_STMPE=y
-CONFIG_MFD_RK808=y
+CONFIG_REGULATOR=y
-CONFIG_MFD_SEC_CORE=y
-CONFIG_MFD_SL28CPLD=y
-CONFIG_MFD_ROHM_BD718XX=y
-CONFIG_MFD_WCD934X=m
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_AXP20X=y
+CONFIG_REGULATOR_ANATOP=y
-CONFIG_REGULATOR_BD718XX=y
+CONFIG_REGULATOR_DA9052=y
-CONFIG_REGULATOR_BD9571MWV=y
+CONFIG_REGULATOR_DA9062=y
-CONFIG_REGULATOR_FAN53555=y
+CONFIG_REGULATOR_DA9063=y
 CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_HI6421V530=y
+CONFIG_REGULATOR_LTC3676=y
-CONFIG_REGULATOR_MAX77620=y
+CONFIG_REGULATOR_MAX17135=y
-CONFIG_REGULATOR_MAX8973=y
+CONFIG_REGULATOR_MC13783=y
-CONFIG_REGULATOR_FP9931=y
+CONFIG_REGULATOR_MC13892=y
-CONFIG_REGULATOR_MP8859=y
+CONFIG_REGULATOR_PF1550_RPMSG=y
-CONFIG_REGULATOR_MT6358=y
-CONFIG_REGULATOR_MT6397=y
-CONFIG_REGULATOR_PCA9450=y
-CONFIG_REGULATOR_PF8X00=y
 CONFIG_REGULATOR_PFUZE100=y
-CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RN5T618=y
-CONFIG_REGULATOR_QCOM_SPMI=y
+CONFIG_RC_CORE=y
-CONFIG_REGULATOR_RK808=y
-CONFIG_REGULATOR_S2MPS11=y
-CONFIG_REGULATOR_TPS65132=m
-CONFIG_REGULATOR_VCTRL=m
-CONFIG_RC_CORE=m
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-CONFIG_IR_RCMM_DECODER=m
 CONFIG_RC_DEVICES=y
-CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_CIR=y
 CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-# CONFIG_DVB_NET is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
+CONFIG_RADIO_SI476X=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MXC_CAPTURE=y
+CONFIG_VIDEO_MUX=y
-CONFIG_VIDEO_MX8_CAPTURE=y
+CONFIG_VIDEO_MXC_CAPTURE=m
-CONFIG_VIDEO_MXC_CSI_CAMERA=y
+CONFIG_VIDEO_MXC_OUTPUT=y
-CONFIG_MXC_MIPI_CSI=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
-CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y
+CONFIG_MXC_VADC=m
+CONFIG_MXC_MIPI_CSI=m
+CONFIG_MXC_CAMERA_OV5640=m
+CONFIG_MXC_CAMERA_OV5640_V2=m
+CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m
+CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
+CONFIG_VIDEO_MXC_IPU_OUTPUT=y
+CONFIG_VIDEO_MXC_PXP_V4L2=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_IMX8_JPEG=m
+CONFIG_VIDEO_CODA=m
-CONFIG_SDR_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_IMX_PXP=y
-CONFIG_VIDEO_IMX219=m
+CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_OV5640=y
+CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV5645=m
-CONFIG_IMX_DPU_CORE=y
-CONFIG_IMX_LCDIF_CORE=y
-CONFIG_IMX_LCDIFV3_CORE=y
 CONFIG_DRM=y
-CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_PANEL_LVDS=y
-CONFIG_DRM_MALI_DISPLAY=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_RCAR_DW_HDMI=m
-CONFIG_DRM_RCAR_LVDS=m
-CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
-CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=y
-CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
-CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
-CONFIG_DRM_PANEL_RAYDIUM_RM68200=y
-CONFIG_DRM_PANEL_ROCKTECK_HIMAX8394F=y
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
-CONFIG_DRM_PANEL_SITRONIX_ST7703=m
+CONFIG_DRM_TI_TFP410=y
-CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
-CONFIG_DRM_PANEL_WKS_101WX001=y
-CONFIG_DRM_DISPLAY_CONNECTOR=m
-CONFIG_DRM_LONTIUM_LT8912B=m
-CONFIG_DRM_LONTIUM_LT9611=m
-CONFIG_DRM_LONTIUM_LT9611UXC=m
-CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y
-CONFIG_DRM_NWL_MIPI_DSI=y
-CONFIG_DRM_NXP_SEIKO_43WVFIG=y
-CONFIG_DRM_PARADE_PS8640=m
-CONFIG_DRM_SII902X=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_THINE_THC63LVD1024=m
-CONFIG_DRM_TI_SN65DSI86=m
-CONFIG_DRM_I2C_ADV7511=y
-CONFIG_DRM_I2C_ADV7511_AUDIO=y
-CONFIG_DRM_CDNS_HDCP=y
-CONFIG_DRM_CDNS_HDMI_CEC=y
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-CONFIG_DRM_DW_HDMI_GP_AUDIO=y
-CONFIG_DRM_DW_HDMI_CEC=m
-CONFIG_DRM_ITE_IT6263=y
-CONFIG_DRM_ITE_IT6161=y
-CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_LCDIF_MUX_DISPLAY=y
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
-CONFIG_DRM_IMX_TVE=y
-CONFIG_DRM_IMX_LDB=y
-CONFIG_DRM_IMX8QM_LDB=y
-CONFIG_DRM_IMX8QXP_LDB=y
-CONFIG_DRM_IMX8MP_LDB=y
-CONFIG_DRM_IMX_HDMI=y
-CONFIG_DRM_IMX_SEC_DSIM=y
-CONFIG_DRM_IMX_DCNANO=y
-CONFIG_DRM_IMX_DCSS=y
-CONFIG_DRM_IMX_CDNS_MHDP=y
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_HISI_HIBMC=m
-CONFIG_DRM_HISI_KIRIN=m
-CONFIG_DRM_MXSFB=y
-CONFIG_DRM_PL111=m
-CONFIG_DRM_LIMA=m
-CONFIG_DRM_PANFROST=m
 CONFIG_FB=y
-CONFIG_FB_ARMCLCD=y
+CONFIG_FB_MXS=y
-CONFIG_FB_EFI=y
+CONFIG_FB_MXC_SYNC_PANEL=y
+CONFIG_FB_MXC_OVERLAY=y
+CONFIG_FB_MXC_MIPI_DSI_NORTHWEST=y
+CONFIG_FB_MXC_ADV7535=y
+CONFIG_FB_MXC_TRULY_PANEL_TFT3P5581E=y
+CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
+CONFIG_FB_MXC_RK_PANEL_RK055AHD042=y
+CONFIG_FB_MXC_RK_PANEL_RK055IQH042=y
+CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y
+CONFIG_FB_MXC_MIPI_DSI=y
+CONFIG_FB_MXC_LDB=y
+CONFIG_FB_MXC_EINK_PANEL=y
 CONFIG_FB_MXC_EINK_V2_PANEL=y
+CONFIG_FB_MXC_HDMI=y
+CONFIG_FB_MXS_SII902X=y
+CONFIG_FB_MXC_DCIC=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_L4F00242T03=y
+CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_PWM=y
-CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_GPIO=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_ALOOP=m
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_ASRC=y
-CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_MQS=y
-CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_RPMSG=y
-CONFIG_SND_SOC_FSL_EASRC=m
+CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_FSL_ESAI_CLIENT=y
+CONFIG_SND_SOC_IMX_ES8328=y
-CONFIG_SND_SOC_FSL_RPMSG=m
+CONFIG_SND_SOC_IMX_SGTL5000=y
-CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=y
-CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_IMX_HDMI=y
-CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_IMX6QDL_HDMI=y
-CONFIG_SND_SOC_IMX_AUDMIX=m
+CONFIG_SND_SOC_AC97_CODEC=y
-CONFIG_SND_SOC_IMX_HDMI=m
-CONFIG_SND_SOC_IMX_CARD=m
-CONFIG_SND_SOC_IMX_PDM_MIC=m
-CONFIG_SND_SOC_IMX_PCM512X=m
-CONFIG_SND_SOC_SOF_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_OF=m
-CONFIG_SND_SOC_SOF_COMPRESS=y
-CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_IMX8=m
-CONFIG_SND_SOC_SOF_IMX8M=m
-CONFIG_SND_SOC_SOF_IMX8ULP=m
-CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_BT_SCO=y
-CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS42XX8_I2C=y
-CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_WM8960=y
-CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_WM8962=y
-CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_RPMSG_WM8960=y
-CONFIG_SND_SOC_GTM601=m
-CONFIG_SND_SOC_MAX98357A=m
-CONFIG_SND_SOC_MAX98927=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-CONFIG_SND_SOC_PCM3168A_I2C=m
-CONFIG_SND_SOC_RT5659=m
-CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-CONFIG_SND_SOC_SIMPLE_MUX=m
-CONFIG_SND_SOC_SPDIF=m
-CONFIG_SND_SOC_TAS571X=m
-CONFIG_SND_SOC_WCD934X=m
-CONFIG_SND_SOC_WM8524=y
-CONFIG_SND_SOC_WM8904=m
-CONFIG_SND_SOC_WM8960=m
-CONFIG_SND_SOC_WM8962=m
-CONFIG_SND_SOC_WSA881X=m
-CONFIG_SND_SOC_RPMSG_WM8960=m
-CONFIG_SND_SOC_RPMSG_AK4497=m
-CONFIG_SND_SOC_LPASS_WSA_MACRO=m
-CONFIG_SND_SOC_LPASS_VA_MACRO=m
 CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_AUDIO_GRAPH_CARD=y
+CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_MULTITOUCH=m
-CONFIG_I2C_HID_ACPI=m
-CONFIG_I2C_HID_OF=m
-CONFIG_USB_CONN_GPIO=y
 CONFIG_USB=y
-CONFIG_USB_OTG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_HCD_TEST_MODE=y
 CONFIG_USB_ACM=m
 CONFIG_USB_STORAGE=y
-CONFIG_USB_UAS=y
-CONFIG_USB_CDNS_SUPPORT=y
-CONFIG_USB_CDNS3=y
-CONFIG_USB_CDNS3_GADGET=y
-CONFIG_USB_CDNS3_HOST=y
-CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_DWC3=y
-CONFIG_USB_DWC2=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_ISP1760=y
+CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=y
+CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_FTDI_SIO=y
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_TEST=m
-CONFIG_USB_EHSET_TEST_FIXTURE=y
+CONFIG_USB_EHSET_TEST_FIXTURE=m
-CONFIG_USB_HSIC_USB3503=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
-CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_SNP_UDC_PLAT=y
-CONFIG_USB_BDC_UDC=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_SERIAL=y
 CONFIG_USB_CONFIGFS_ACM=y
@@ -736,253 +397,131 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_LB_SS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_UAC1=y
-CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
 CONFIG_USB_CONFIGFS_F_UAC2=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_F_HID=y
 CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
-CONFIG_TYPEC=y
-CONFIG_TYPEC_TCPM=y
-CONFIG_TYPEC_TCPCI=y
-CONFIG_TYPEC_FUSB302=m
-CONFIG_TYPEC_TPS6598X=m
-CONFIG_TYPEC_HD3SS3220=m
-CONFIG_TYPEC_SWITCH_GPIO=y
 CONFIG_MMC=y
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF_ARASAN=y
-CONFIG_MMC_SDHCI_OF_ESDHC=y
-CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MMC_SDHCI_F_SDH30=y
-CONFIG_MMC_SPI=y
-CONFIG_MMC_DW=y
-CONFIG_MMC_DW_EXYNOS=y
-CONFIG_MMC_DW_HI3798CV200=y
-CONFIG_MMC_DW_K3=y
-CONFIG_MMC_MTK=y
-CONFIG_MMC_SDHCI_XENON=y
-CONFIG_MMC_SDHCI_AM654=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_LM3692X=m
-CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_PWM=y
-CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_EDAC=y
-CONFIG_EDAC_GHES=y
-CONFIG_EDAC_LAYERSCAPE=m
-CONFIG_EDAC_SYNOPSYS=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_DS1307=y
-CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_ISL1208=y
-CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_PCF8523=y
-CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=y
-CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80=y
-CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RC5T619=y
-CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_DA9063=y
-CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_MC13XXX=y
-CONFIG_RTC_DRV_S5M=y
+CONFIG_RTC_DRV_MXC=y
-CONFIG_RTC_DRV_DS3232=y
+CONFIG_RTC_DRV_MXC_V2=y
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_EFI=y
-CONFIG_RTC_DRV_CROS_EC=y
-CONFIG_RTC_DRV_FSL_FTM_ALARM=m
-CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_SNVS=y
-CONFIG_RTC_DRV_IMX_SC=y
 CONFIG_RTC_DRV_IMX_RPMSG=y
 CONFIG_DMADEVICES=y
-CONFIG_BCM_SBA_RAID=m
 CONFIG_FSL_EDMA=y
-CONFIG_FSL_QDMA=m
-CONFIG_FSL_EDMA_V3=y
 CONFIG_IMX_SDMA=y
-CONFIG_MV_XOR_V2=y
 CONFIG_MXS_DMA=y
+CONFIG_MXC_PXP_V2=y
 CONFIG_MXC_PXP_V3=y
-CONFIG_PL330_DMA=y
+CONFIG_DMATEST=m
-CONFIG_QCOM_HIDMA_MGMT=y
-CONFIG_QCOM_HIDMA=y
-CONFIG_FSL_DPAA2_QDMA=m
-CONFIG_DMATEST=y
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMABUF_HEAPS_CMA=y
-CONFIG_DMABUF_HEAPS_DSP=y
-CONFIG_UIO_PCI_GENERIC=y
-CONFIG_UIO_IVSHMEM=y
-CONFIG_VFIO=y
-CONFIG_VFIO_PCI=y
-CONFIG_VFIO_FSL_MC=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_IVSHMEM=y
-CONFIG_XEN_GNTDEV=y
-CONFIG_XEN_GRANT_DEV_ALLOC=y
 CONFIG_STAGING=y
 CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_HANTRO=m
-CONFIG_VIDEO_IMX_CAPTURE=y
-CONFIG_IMX8_MEDIA_DEVICE=m
-CONFIG_MHDP_HDMIRX=y
-CONFIG_MHDP_HDMIRX_CEC=y
-CONFIG_FSL_DPAA2=y
-CONFIG_FSL_PPFE=y
-CONFIG_FSL_PPFE_UTIL_DISABLED=y
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CROS_EC=y
-CONFIG_CROS_EC_I2C=y
-CONFIG_CROS_EC_SPI=y
-CONFIG_CROS_EC_CHARDEV=m
-CONFIG_CLK_VEXPRESS_OSC=y
-CONFIG_COMMON_CLK_RK808=y
-CONFIG_COMMON_CLK_SCMI=y
-CONFIG_COMMON_CLK_SCPI=y
-CONFIG_COMMON_CLK_CS2000_CP=y
-CONFIG_COMMON_CLK_FSL_SAI=y
-CONFIG_COMMON_CLK_S2MPS11=y
-CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
-CONFIG_COMMON_CLK_VC5=y
-CONFIG_CLK_IMX8MM=y
-CONFIG_CLK_IMX8MN=y
-CONFIG_CLK_IMX8MP=y
-CONFIG_CLK_IMX8MQ=y
-CONFIG_CLK_IMX8QXP=y
-CONFIG_CLK_IMX8ULP=y
-CONFIG_HWSPINLOCK=y
-CONFIG_ARM_MHU=y
-CONFIG_IMX_MBOX=y
-CONFIG_PLATFORM_MHU=y
-CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
-CONFIG_ARM_SMMU=y
-CONFIG_ARM_SMMU_V3=y
 CONFIG_REMOTEPROC=y
 CONFIG_IMX_REMOTEPROC=y
-CONFIG_IMX_DSP_REMOTEPROC=m
-CONFIG_RPMSG_CHAR=m
-CONFIG_RPMSG_QCOM_GLINK_RPM=y
-CONFIG_SOUNDWIRE=m
-CONFIG_SOUNDWIRE_QCOM=m
-CONFIG_SOC_BRCMSTB=y
-CONFIG_FSL_DPAA=y
-CONFIG_FSL_MC_DPIO=y
-CONFIG_FSL_RCPM=y
-CONFIG_FSL_QIXIS=y
-CONFIG_SOC_TI=y
-CONFIG_ARM_IMX_BUS_DEVFREQ=m
-CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
-CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_USB_GPIO=y
-CONFIG_EXTCON_USBC_CROS_EC=y
 CONFIG_IIO=y
-CONFIG_FXLS8962AF_I2C=m
+CONFIG_MMA8452=y
-CONFIG_IMX8QXP_ADC=y
+CONFIG_IMX7D_ADC=y
-CONFIG_MAX9611=m
+CONFIG_RN5T618_ADC=y
-CONFIG_QCOM_SPMI_VADC=m
+CONFIG_VF610_ADC=y
-CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_IIO_CROS_EC_SENSORS_CORE=m
-CONFIG_IIO_CROS_EC_SENSORS=m
 CONFIG_FXAS21002C=y
 CONFIG_FXOS8700_I2C=y
 CONFIG_RPMSG_IIO_PEDOMETER=m
-CONFIG_IIO_ST_LSM6DSX=y
-CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 CONFIG_SENSORS_ISL29018=y
-CONFIG_VCNL4000=m
+CONFIG_MAG3110=y
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_CROS_EC_BARO=m
 CONFIG_MPL3115=y
 CONFIG_PWM=y
-CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_FSL_FTM=y
-CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_IMX27=y
-CONFIG_PWM_RPCHIP=y
+CONFIG_PWM_IMX_TPM=y
-CONFIG_PWM_SL28CPLD=m
-CONFIG_SL28CPLD_INTC=y
-CONFIG_RESET_IMX7=y
-CONFIG_RESET_IMX8ULP_SIM=y
-CONFIG_PHY_XGENE=y
 CONFIG_PHY_MIXEL_LVDS=y
 CONFIG_PHY_MIXEL_LVDS_COMBO=y
-CONFIG_PHY_CADENCE_SALVO=y
-CONFIG_PHY_FSL_IMX8MP_LVDS=y
-CONFIG_PHY_MIXEL_MIPI_DPHY=y
-CONFIG_PHY_SAMSUNG_HDMI_PHY=y
-CONFIG_PHY_QCOM_USB_HS=y
-CONFIG_PHY_SAMSUNG_USB2=y
-CONFIG_ARM_SMMU_V3_PMU=m
-CONFIG_FSL_IMX8_DDR_PMU=y
-CONFIG_HISI_PMU=y
 CONFIG_NVMEM_IMX_OCOTP=y
-CONFIG_NVMEM_IMX_OCOTP_SCU=y
+CONFIG_NVMEM_SNVS_LPGPR=y
-CONFIG_NVMEM_RMEM=m
-CONFIG_FPGA=y
-CONFIG_FPGA_BRIDGE=m
-CONFIG_ALTERA_FREEZE_BRIDGE=m
-CONFIG_FPGA_REGION=m
-CONFIG_OF_FPGA_REGION=m
 CONFIG_TEE=y
 CONFIG_OPTEE=y
 CONFIG_MUX_MMIO=y
-CONFIG_SLIM_QCOM_CTRL=m
+CONFIG_SIOX=m
-CONFIG_INTERCONNECT=y
+CONFIG_SIOX_BUS_GPIO=m
-CONFIG_INTERCONNECT_IMX=m
-CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_MXC_SIM=y
-CONFIG_MXC_EMVSIM=y
+CONFIG_MXC_IPU=y
+CONFIG_MXC_SIMv2=y
+CONFIG_MXC_MLB150=y
+CONFIG_MXC_IPU_V3_PRE=y
+CONFIG_MXC_HDMI_CEC=y
+CONFIG_MXC_MIPI_CSI2=y
 CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT3_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_BTRFS_FS=m
+CONFIG_EXT3_FS_SECURITY=y
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
-CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=y
-CONFIG_OVERLAY_FS=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_HUGETLBFS=y
-CONFIG_EFIVAR_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_UBIFS_FS=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_XZ=y
 CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_ROOT_NFS=y
-CONFIG_9P_FS=y
+CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_SECURITY=y
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_UTF8=y
+CONFIG_SECURITYFS=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_ECHAINIV=m
-CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_TLS=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
@@ -991,9 +530,14 @@ CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_ANUBIS=m
@@ -1002,49 +546,42 @@ CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=m
 CONFIG_CRYPTO_DEV_FSL_CAAM=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m
-CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
+CONFIG_CRYPTO_DEV_SAHARA=y
-CONFIG_CRYPTO_DEV_CCREE=m
+CONFIG_CRYPTO_DEV_MXS_DCP=y
-CONFIG_CRYPTO_DEV_HISI_SEC2=m
-CONFIG_CRYPTO_DEV_HISI_ZIP=m
-CONFIG_CRYPTO_DEV_HISI_HPRE=m
-CONFIG_CRYPTO_DEV_HISI_TRNG=m
-CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
-CONFIG_INDIRECT_PIO=y
 CONFIG_CRC_CCITT=m
-CONFIG_CRC8=y
+CONFIG_CRC_T10DIF=y
-CONFIG_CMA_SIZE_MBYTES=32
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_DMA_CMA=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_INFO_REDUCED=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_KERNEL=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_FTRACE is not set
-CONFIG_CORESIGHT=y
-CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
+# enable AF_ALG
-CONFIG_CORESIGHT_SOURCE_ETM4X=y
+CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_MEMTEST=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# enable KTLS
 CONFIG_TLS=y
 CONFIG_TLS_DEVICE=y
-# enable Trusted Keys based on CAAM
-CONFIG_TRUSTED_KEYS=m
-CONFIG_TRUSTED_KEYS_TPM=n
-CONFIG_TRUSTED_KEYS_TEE=n
-CONFIG_TRUSTED_KEYS_CAAM=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_5.15.bb
index 19626ccf..2db57df4 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.15.bb
@@ -38,7 +38,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
-# fec_uio: fix implicit declaration
+# beacf1c5267a fec_uio: fix implicit declaration
 # e8093f50522f cert host tools: Stop complaining about deprecated OpenSSL functions
 # 49c2d3b7964d gpio: fix enabling GPIO_VF610
 # c04a396fcbf7 ARM: mach-imx: conditionally disable some functions from busfreq-imx
@@ -58,14 +58,14 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 KBRANCH = "5.15-2.0.x-imx"
-SRCREV = "d818413e4d7901cb8a00a631a389326e2c93ae41"
+SRCREV = "845d53f13aac7d712b931a21df53bc8ccb22b31b"
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
 # required by kernel-yocto.bbclass.
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "5.15.60"
+LINUX_VERSION = "5.15.67"
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
 LOCALVERSION = "-5.15.60-2.0.0"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch
new file mode 100644
index 00000000..19057147
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch
@@ -0,0 +1,48 @@
+From 071fd005ad6572767d7441c97549b1c904719944 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 12 Sep 2022 20:29:25 -0700
+Subject: [PATCH] gstallocatorphymem.c: Typecast result of gst_phymem_get_phy
+ to guintptr
+This fixes a warning/error found with clang-15
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gst-libs/gst/allocators/gstallocatorphymem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+--- a/gst-libs/gst/allocators/gstallocatorphymem.c
+++ b/gst-libs/gst/allocators/gstallocatorphymem.c
+@@ -225,7 +225,7 @@ static guintptr
+ gst_allocator_phymem_get_phys_addr (GstPhysMemoryAllocator * allocator,
+     GstMemory * mem)
+ {
+-  return gst_phymem_get_phy (mem);
+  return (guintptr)gst_phymem_get_phy (mem);
+ }
+ 
+ static void
+--- a/gst-libs/gst/gl/gstglphymemory.c
+++ b/gst-libs/gst/gl/gstglphymemory.c
+@@ -337,7 +337,7 @@ gst_gl_physical_memory_setup_buffer (Gst
+     GST_VIDEO_INFO_HEIGHT (info),
+     viv_fmt,
+     memblk->vaddr,
+-    memblk->paddr,
+    (guint)memblk->paddr,
+     FALSE
+   };
+ 
+--- a/gst/subparse/gstssaparse.c
+++ b/gst/subparse/gstssaparse.c
+@@ -24,7 +24,9 @@
+ #include "config.h"
+ #endif
+ 
+#include <ctype.h>              /* isspace() */
+ #include <stdlib.h>             /* atoi() */
+#include <stdio.h>              /* sscanf() */
+ #include <string.h>
+ 
+ #include "gstssaparse.h"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb
index 3fce3a58..3cbd2179 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb
@@ -17,6 +17,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
           file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
           file://0003-viv-fb-Make-sure-config.h-is-included.patch \
           file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
+           file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch \
           "
 SRC_URI[sha256sum] = "96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204"
@@ -136,6 +137,10 @@ PACKAGECONFIG[viv-fb] = ",,virtual/libgles2"
 EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}""
+# 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"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
 ########### End of i.MX overrides #########
diff --git a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb
index 3d557207..957d6ddf 100644
--- a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb
+++ b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.2.bb
@@ -16,3 +16,7 @@ INSANE_SKIP:${PN} = "already-stripped"
 FILES:${PN} += "${datadir}/imx-mm"
 COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
+INSANE_SKIP:append:libc-musl = " file-rdeps"
+RDEPENDS:${PN}:append:libc-musl = " gcompat"