[PATCH 01/32] imx-vpu: Update to version 5.4.38

[PATCH 01/32] imx-vpu: Update to version 5.4.38

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Update license checksum to match EULA v22 April 2018.
  - Remove .inc file to use only one .bb file
  - Update O.S. Systems Software Copyright

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb           | 12 ------------
 .../imx-vpu/{imx-vpu.inc => imx-vpu_5.4.38.bb}  | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
 rename recipes-bsp/imx-vpu/{imx-vpu.inc => imx-vpu_5.4.38.bb} (61%)

diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
deleted file mode 100644
index 7dbaa819..00000000
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-
-require imx-vpu.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a"
-
-PE = "1"
-
-SRC_URI[md5sum] = "2b8311cb6e5b5813253db706e807d962"
-SRC_URI[sha256sum] = "ee265e88d17c7369bd9cb917e7cce035b8c7ee2ba4491645fdab9f382f54beb0"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu.inc b/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb
similarity index 61%
rename from recipes-bsp/imx-vpu/imx-vpu.inc
rename to recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb
index 7b339565..f0c9d5a5 100644
--- a/recipes-bsp/imx-vpu/imx-vpu.inc
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb
@@ -1,20 +1,26 @@
-# Copyright (C) 2013-2017 O.S. Systems Software LTDA.
-# Copyright (C) 2013 Freescale Semiconductor
+# Copyright (C) 2013-2018 O.S. Systems Software LTDA.
+# Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2017 NXP
 
 DESCRIPTION = "Freescale VPU library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
+
 DEPENDS = "virtual/kernel"
 
 PROVIDES = "virtual/imxvpu"
 
+PE = "1"
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "521d5f839829f8d1f2a6a0e60270243e"
+SRC_URI[sha256sum] = "34bed0ddf6c797f444bddfa5d5495adc751ff268b6431d8beb48129c89c9e47f"
+
 inherit fsl-eula-unpack
 
 PLATFORM_mx6 = "IMX6Q"
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-
 do_compile () {
     INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"
 
@@ -26,3 +32,4 @@ do_install () {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6)"
-- 
2.18.0

[PATCH 02/32] imx-gpu-viv: Update to 6.2.4.p1.2

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

Key Features of the Vivante 6.x Driver Series

    - Full support for Khronos OpenGL ES 3.2 API. The new OpenGL ES 3.2 and OpenGL ES Shading Language 3.20 specifications bring AEP,
      plus additional functionality, into core OpenGL ES. Vivante OpenGL ES 3.2 implementation has passed Khronos OpenGL ES 3.2 Conformance Test.
      And Vivante GC7000XS* GPU core has been certified by Khronos as an OpenGL ES 3.2 compliant product.

    - Backward Compatible with 5.x and 4.x Drivers. Existing OpenGL ES 3.x/2.0 applications can run on these drivers without any changes.

6.2.4P1 GPU Release (8MQ GA)
========================================

Key Features
============
- OpenCL improvements
- Wayland-weston DRM Support
- Wayland-weston with 2D accelerated renderer
- Wayland-Weston EGL DRM Modifier support
- Wayland-Weston EGL Framebuffer compression
- Wayland-Weston DMABUF support
- OpenCV tests with OpenCL
- Add GPU DRM support
- GLES CTS version 3.2.4

6.2.4P1 Improvements
==================
OCL: MGS-3255-34 add opencl memory optimzation
OCL: MGS-3255-33 fix opencl test buffer copy failure
OCL: MGS-3640 fix opencl corruption for arm_compute_library
OCL: MGS-3710 SoftISP meet CL_INVALID_WORK_GROUP_SIZE (-54) on mscale and qxp
OCL: cache invalidate for uncached buffer get accesing user space memory outsied uaccess.h error
OCL: ovx and ocl running together
EGL MGS-3711 met display blurred when run weston-nested
EGL:  Enable extension EGL_EXT_image_dma_buf_import_modifiers
EGL: weston-nested met process aborted and core dump
EGL: MGS-3399 fix wayland egl resize cts failure
EGL: support direct rendering on external drm buffer
EGL: MGS-3840-2 fix 6qp display flicker with fbdev test
EGL: MGS-3791 imx6q shared egl context rendering issue
EGL: MGS-3744 fix GC355 OpenVG flicker on wayland
EGL: MA-11528 Support enable framebuffer direct rendering
GLES3.0: 6QP FB have CTS failures with ESCTS 3.2.2.0
GLES: MGS-3570 glGenerateMipmap takes too much time on 5.x/6.x driver
Weston:  Disable surface compress if g2d-renderer
GBM: Enable DRM compression for mscale board
GBM: MGS-3625 6.2.4.p1: Fix xserver build break with GBM change
GBM :MGS-3694 enable fb fd and tile status fd in GPU and DCSS on wayland
Android:MA-11232 Enable HDR10 support on imx8mq platform.
Android: MA-10844 GPU driver pass build after refine some NXP git path
Android : MA-11101 Add HAL_PIXEL_FORMAT_NV12_TILED format to support VPU tile
QNX:iMX8QM MGS-2906 VDK app fail if it's started as the first app after screen
QNX:iMX8QM MGS-3289 [iMX8] Rotation using blitter seems broken
QNX:iMX8QM MGS-3338  - Deadlock seen with Screen API test
QNX:iMX8QM MGS-3323 QNX -[iMX8] Fix NV12 handling
iMX8QM Disable depth compression for LPDDR4 parts
OCL: MGS-3848-5 OCL1.2: test_image_streams failures
OCL:MGS-3832 cl_convolution of ACL cause MMU exception
OVX: MGS-3579  Fix the invalid scope of VX graph for 8QM
OVG: MGS-3826 met core dump and system prompt out of memory when do OpenVG memory leak test.
OVG: MGS-3750 fix gc355 openvg stuck issue on 6q and 6qp
OVG: MGS-3791 VGCTS failed to run on i.MX6SL wayland
OGL: MGS-3570 glGenerateMipmap takes too much time on 5.x/6.x driver
OGL: MGS-3741 glmark2 test met error message
General: MGS-3848 refinements for pm and isr
General: MGS-3840 Display resume back very slow and has snow screen after suspend and resume.
General: MGS-3751 met GPU core dump when run multiple es20 sdk apps

Known Issues
============
MGS-3770 [6q/6qp] can not generate correct reference file after do api retrace and sometimes met stuck
    - Need wayland support in waffle. will be addressed in next release
MGS-3747 [6dl/6q] X11: copytex can't work after "Qt5_NMapper" app test.
YOCIMX-2354 Some qt3-3d demos not work. Issue related to QTwayland in 5.8 later
MGS-3739 can not pass webgl 1.0.2 CTS test. Chromium 64 known issue. Same reproduced on desktop

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../imx-gpu-viv/imx-gpu-viv-6.inc             | 70 ++++++++++++++-----
 ...2.bb => imx-gpu-viv_6.2.4.p1.2-aarch32.bb} |  4 +-
 2 files changed, 53 insertions(+), 21 deletions(-)
 rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_6.2.2.p0-aarch32.bb => imx-gpu-viv_6.2.4.p1.2-aarch32.bb} (66%)

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 b6f5f24e..f47bd973 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -1,11 +1,11 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "GPU driver and apps for i.MX"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
 
 DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
@@ -13,6 +13,10 @@ DEPENDS += " \
                                                        '', d), d)} \
 "
 DEPENDS += "libdrm"
+DEPENDS += " \
+    ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
+                                                       '', d)} \
+"
 
 # imx-gpu-viv does not provide everything it needs to for virtual/libgl
 # on x11 backend or on Wayland backend with XWayland support.
@@ -20,9 +24,23 @@ DEPENDS += "libdrm"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
 
 EXTRA_PROVIDES = ""
-EXTRA_PROVIDES_append_imxgpu3d = " virtual/libgl virtual/libgles1 virtual/libgles2"
-EXTRA_PROVIDES_append_mx6q     = " virtual/opencl-icd opencl-headers"
-PROVIDES += "imx-gpu-viv virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg ${EXTRA_PROVIDES}"
+EXTRA_PROVIDES_append_imxgpu3d = " \
+    virtual/libgl \
+    virtual/libgles1 \
+    virtual/libgles2 \
+"
+"
+PROVIDES += " \
+    imx-gpu-viv \
+    virtual/libgal-x11 \
+    opencl-headers \
+    virtual/egl \
+    virtual/libopenvg \
+    virtual/opencl-headers \
+    virtual/opencl-icd \
+    virtual/wayland-egl \
+    ${EXTRA_PROVIDES} \
+"
 
 RPROVIDES_${PN}_imxgpu3d += "imx-gpu-viv"
 
@@ -73,16 +91,15 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 REALSOLIBS := "${SOLIBS}"
 SOLIBS = "${SOLIBSDEV}"
 
-# For the packages that make up the OpenGL interfaces, inject variables so that
-# they don't get Debian-renamed (which would remove the -imx suffix).
-#
-# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
-# the source we cannot fix it. Disable the insane check for now.
 python __anonymous() {
+    # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
+    # the source we cannot fix it. Disable the insane check for now.
     packages = d.getVar('PACKAGES', True).split()
     for p in packages:
         d.appendVar("INSANE_SKIP_%s" % p, " ldflags")
 
+    # For the packages that make up the OpenGL interfaces, inject variables so that
+    # they don't get Debian-renamed (which would remove the -imx suffix).
     for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
               ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
               ("libgles3",) , ("libvulkan",)):
@@ -105,6 +122,10 @@ python __anonymous() {
 IS_MX6SL = "0"
 IS_MX6SL_mx6sl = "1"
 
+PACKAGE_FP_TYPE = "hardfp"
+
+GLES3_HEADER_REMOVALS = "gl31.h gl32.h"
+
 do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
@@ -115,6 +136,8 @@ do_install () {
     cp -r ${S}/gpu-demos/opt ${D}
     cp -r ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir}
 
+    # Use vulkan header from vulkan recipe to support vkmark
+    rm -rf ${D}${includedir}/vulkan/vulkan.h
 
     install -d ${D}${libdir}/pkgconfig
 
@@ -127,10 +150,6 @@ do_install () {
         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/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
 
        if [ "${USE_X11}" = "yes" ]; then
 
@@ -176,7 +195,16 @@ do_install () {
     ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1
     ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so
     mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so
-    mv ${D}${libdir}/libVDK-${backend}.so ${D}${libdir}/libVDK.so
+    if [ "${USE_WL}" = "yes" ]; then
+        # Special case for libVDK on Wayland backend, deliver fb library as well.
+        # Need to rename the libraries to avoid the code below that will remove
+        # *-fb.so and *-wl.so
+        mv ${D}${libdir}/libVDK-fb.so ${D}${libdir}/libVDK-framebuffer.so
+        mv ${D}${libdir}/libVDK-wl.so ${D}${libdir}/libVDK-wayland.so
+        ln -sf libVDK-wayland.so ${D}${libdir}/libVDK.so
+    else
+        mv ${D}${libdir}/libVDK-${backend}.so ${D}${libdir}/libVDK.so
+    fi
 
     # update libglesv2 as backend dependent
     rm -rf ${D}${libdir}/libGLESv2*
@@ -184,10 +212,14 @@ do_install () {
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
 
+    for header in ${GLES3_HEADER_REMOVALS}; do
+        rm -f ${D}${includedir}/GLES3/${header}
+    done
+
     # skip packaging wayland libraries if no support is requested
     if [ "${USE_WL}" = "no" ]; then
-        rm ${D}${libdir}/libgc_wayland_protocol.*
-        rm ${D}${libdir}/libwayland-viv.*
+        find ${D}${libdir} -name "libgc_wayland_protocol.*" -exec rm '{}' ';'
+        find ${D}${libdir} -name "libwayland-viv.*" -exec rm '{}' ';'
     fi
 
     for i in wl x11 fb dri; do
@@ -234,7 +266,6 @@ FILES_libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
 INSANE_SKIP_libegl-imx += "dev-so"
 FILES_libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
 FILES_libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
-RDEPENDS_libegl-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libgc-wayland-protocol-imx libwayland-viv-imx libgc-wayland-protocol-imx', '', d)}"
 RDEPENDS_libegl-imx-dev += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libwayland-egl-imx-dev', '', d)}"
 
 FILES_libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
@@ -290,8 +321,9 @@ INSANE_SKIP_libopenvg-imx += "dev-so"
 FILES_libopenvg-imx = "${libdir}/libOpenVG*${SOLIBS}"
 FILES_libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc"
 
-FILES_libvdk-imx = "${libdir}/libVDK${SOLIBS}"
+FILES_libvdk-imx = "${libdir}/libVDK*${SOLIBS}"
 FILES_libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}"
+INSANE_SKIP_libvdk-imx += "dev-so"
 
 FILES_libvivante-dri-imx = "${libdir}/dri/vivante_dri.so"
 RDEPENDS_libvivante-dri-imx = "libdrm"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.2.p0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch32.bb
similarity index 66%
rename from recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.2.p0-aarch32.bb
rename to recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch32.bb
index 9f3b7cc1..05004570 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.2.p0-aarch32.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch32.bb
@@ -4,8 +4,8 @@
 
 require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
 
-SRC_URI[md5sum] = "7d43f73b8bc0c1c442587f819218a1d5"
-SRC_URI[sha256sum] = "4f93a4412c93ca5959aa2437bfed2ecbaf983b5b272be5977f76a967de5db150"
+SRC_URI[md5sum] = "280990aab8dee2ee9ce508cbf0d6833f"
+SRC_URI[sha256sum] = "dddadd164bede4793409ccfb636324dd73862c33458db66a5860f126bada25dc"
 
 PACKAGE_FP_TYPE = "hardfp"
 
-- 
2.18.0

[PATCH 03/32] imx-gpu-g2d: Update to version 6.2.4

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Update license checksum to match EULA v22 April 2018.
  - Add O.S. Systems Software Copyright

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 ...gpu-g2d_6.2.2.p0.bb => imx-gpu-g2d_6.2.4.p1.2.bb} | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
 rename recipes-graphics/imx-gpu-g2d/{imx-gpu-g2d_6.2.2.p0.bb => imx-gpu-g2d_6.2.4.p1.2.bb} (62%)

diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
similarity index 62%
rename from recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb
rename to recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
index 8be05f93..88130705 100644
--- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb
+++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
@@ -1,11 +1,13 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017 NXP
+# Copyright 2017-2018 NXP
+# Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-DESCRIPTION = "GPU G2D library and apps for imx6"
+DESCRIPTION = "G2D graphics library and apps for i.MX 6 and i.MX 7 GPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
 
+DEPENDS += "virtual/libgal-x11"
 PROVIDES += "virtual/libg2d"
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
@@ -14,8 +16,8 @@ S="${WORKDIR}/${PN}-${PV}"
 
 inherit fsl-eula-unpack
 
-SRC_URI[md5sum] = "64720dda9b96fd7af5be7e2c654ab72a"
-SRC_URI[sha256sum] = "070a95aa9942bd67e8ba4012962df74143bffb9998301ac097dab5e1437000d8"
+SRC_URI[md5sum] = "fd93eb85a64a18dac3b6c2ead86c8333"
+SRC_URI[sha256sum] = "5f2d2171d5cd57f37ab07184fc908a0f6ecb2a97f023f04c2f9f3b3d7fec8481"
 
 do_install () {
 
-- 
2.18.0

[PATCH 04/32] imx-parser: Update to version 4.3.5

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Update license checksum to match EULA v22 April 2018.
  - Remove .inc file to use only one .bb file
  - Update O.S. Systems Software Copyright

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-multimedia/imx-parser/imx-parser_4.3.4.bb    | 10 ----------
 .../{imx-parser.inc => imx-parser_4.3.5.bb}          | 12 ++++++++----
 2 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 recipes-multimedia/imx-parser/imx-parser_4.3.4.bb
 rename recipes-multimedia/imx-parser/{imx-parser.inc => imx-parser_4.3.5.bb} (81%)

diff --git a/recipes-multimedia/imx-parser/imx-parser_4.3.4.bb b/recipes-multimedia/imx-parser/imx-parser_4.3.4.bb
deleted file mode 100644
index 8ae2c8f8..00000000
--- a/recipes-multimedia/imx-parser/imx-parser_4.3.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-parser.inc
-
-SRC_URI[md5sum] = "f6ac916c8d6ccf66f9da58bc230f0d1d"
-SRC_URI[sha256sum] = "29a199c79a4a7e01e3c386018c854b6be5d839061b15f8519e19fea8bf77121d"
-
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
diff --git a/recipes-multimedia/imx-parser/imx-parser.inc b/recipes-multimedia/imx-parser/imx-parser_4.3.5.bb
similarity index 81%
rename from recipes-multimedia/imx-parser/imx-parser.inc
rename to recipes-multimedia/imx-parser/imx-parser_4.3.5.bb
index 3a78f6ac..da031e84 100644
--- a/recipes-multimedia/imx-parser/imx-parser.inc
+++ b/recipes-multimedia/imx-parser/imx-parser_4.3.5.bb
@@ -1,11 +1,11 @@
-# Copyright (C) 2012-2014, 2016 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
 # Copyright (C) 2012-2016 Freescale Semiconductor
 # Copyright 2017 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
 
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -13,9 +13,11 @@ RREPLACES_${PN} = "libfslparser"
 RPROVIDES_${PN} = "libfslparser"
 RCONFLICTS_${PN} = "libfslparser"
 
-inherit fsl-eula-unpack autotools pkgconfig
-
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "54fcf59ec947955aceae51831d3ccb46"
+SRC_URI[sha256sum] = "9cd8c49a0bb1050afcfbcc7a677a348443fda4ecacb621cc6e38897619e27c67"
+
+inherit fsl-eula-unpack autotools pkgconfig
 
 # Choose between Soft Float-Point and Hard Float-Point
 EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '--enable-fsw', d)}"
@@ -39,3 +41,5 @@ FILES_${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 INHIBIT_SYSROOT_STRIP = "1"
+
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
-- 
2.18.0

[PATCH 05/32] imx-codec: Update to version 4.3.5

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Remove .inc file to use only one .bb file
  - Add O.S. Systems Software Copyright

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-multimedia/imx-codec/imx-codec_4.3.4.bb        | 10 ----------
 .../imx-codec/{imx-codec.inc => imx-codec_4.3.5.bb}    | 10 +++++++---
 2 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 recipes-multimedia/imx-codec/imx-codec_4.3.4.bb
 rename recipes-multimedia/imx-codec/{imx-codec.inc => imx-codec_4.3.5.bb} (93%)

diff --git a/recipes-multimedia/imx-codec/imx-codec_4.3.4.bb b/recipes-multimedia/imx-codec/imx-codec_4.3.4.bb
deleted file mode 100644
index 7e48b214..00000000
--- a/recipes-multimedia/imx-codec/imx-codec_4.3.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-codec.inc
-
-SRC_URI[md5sum] = "f86bcdd3a43a9d1abfb1de52c37b5f9f"
-SRC_URI[sha256sum] = "650a3f6bf54c3f3b79de11eb4d6d0592372ab6a56386136b8d5e6cfb31fe9b55"
-
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
diff --git a/recipes-multimedia/imx-codec/imx-codec.inc b/recipes-multimedia/imx-codec/imx-codec_4.3.5.bb
similarity index 93%
rename from recipes-multimedia/imx-codec/imx-codec.inc
rename to recipes-multimedia/imx-codec/imx-codec_4.3.5.bb
index a42dcbc6..daf5b84d 100644
--- a/recipes-multimedia/imx-codec/imx-codec.inc
+++ b/recipes-multimedia/imx-codec/imx-codec_4.3.5.bb
@@ -1,17 +1,20 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
 # Copyright 2017 NXP
+# Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia codec libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
 
 # Backward compatibility
 PROVIDES += "libfslcodec"
 
-inherit fsl-eula-unpack autotools pkgconfig
-
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "ea080472c3fe5f5ae4760ba16c8ea6c5"
+SRC_URI[sha256sum] = "6bb54f91c3ca18567e14d95d3858022dc9be00dc86e9edfdb544d1240a3b2b04"
+
+inherit fsl-eula-unpack autotools pkgconfig
 
 # Choose between Soft Float-Point and Hard Float-Point
 EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '', d)}"
@@ -112,3 +115,4 @@ FILES_${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux
 FILES_${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
-- 
2.18.0

[PATCH 06/32] imx-vpuwrap: Update to version 4.3.5

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Add O.S. Systems Software Copyright

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../{imx-vpuwrap_4.3.4.bb => imx-vpuwrap_4.3.5.bb}         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename recipes-multimedia/imx-vpuwrap/{imx-vpuwrap_4.3.4.bb => imx-vpuwrap_4.3.5.bb} (73%)

diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.3.4.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.3.5.bb
similarity index 73%
rename from recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.3.4.bb
rename to recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.3.5.bb
index df73f4a3..2d4bdf68 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.3.4.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.3.5.bb
@@ -1,11 +1,12 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2017 NXP
+# Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 DEPENDS = "virtual/imxvpu"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
 
 # For backwards compatibility
 PROVIDES += "libfslvpuwrap"
@@ -15,8 +16,8 @@ RCONFLICTS_${PN} = "libfslvpuwrap"
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "bd832f70ef90dbbdc5a24e2a1eefc71f"
-SRC_URI[sha256sum] = "cd49a4d9379c2d3ffd71a4c8e81dcb30097d43899d11ccaa77ec981dbdec596b"
+SRC_URI[md5sum] = "ebcafcd76ec7c5b7cb9ba084da2b5612"
+SRC_URI[sha256sum] = "5c08b4b7c771404c998779f0e27a75564b57958d463e2df152c910d76cca9e44"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
-- 
2.18.0

[PATCH 07/32] imx-kobs: Bump revision to c70685d

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Add O.S. Systems Software Copyright

This includes the following changes:

    - c70685d Merge pull request #13 from allenxh/imx8
    - d8e5142 imx-kobs: support burn images to imx8mq ddr4 arm2 NAND
    - a0e9adc Merge pull request #10 from allenxh/imx8
    - 89c14fe imx-kobs: support i.MX8 platforms

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-bsp/imx-kobs/imx-kobs_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb
index 096d074e..4bd77264 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_git.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb
@@ -1,5 +1,6 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2017 NXP
+# Copyright 2018 (C) O.S. Systems Software LTDA.
 
 SUMMARY = "Nand boot write source"
 SECTION = "base"
@@ -7,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 PV = "5.5+git${SRCPV}"
-SRCREV = "a2734b93759b4222f9dfa3f8c7645be9d39ea601"
+SRCREV = "c70685de47cfb67c5e16e1631b7033023ca3e97c"
 
 SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocal=https \
            file://0001-Add-missing-includes-as-pointed-out-by-musl.patch \
-- 
2.18.0

[PATCH 08/32] libimxvpuapi: Bump revision to 4afb52f

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

 - Rename recipe to use latest git revision.
 - Add O.S. Systems Software Copyright
 - Add PV to use 0.10.3 release on name

This change includes the following changes:

    - 4afb52f Merge pull request #22 from bmx666/master
    - 691ea9a Add imx_vpu_enc_configure_gop_size() function
    - 97a9ff2 Merge pull request #17 from Artox/master
    - 5739ffc add e-mail address to maintainer field
    - b5ff857 libimxvpuapi-dev: add debhelper generated ${misc:Depends} to depends

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../{libimxvpuapi_0.10.3.bb => libimxvpuapi_git.bb}          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename recipes-multimedia/libimxvpuapi/{libimxvpuapi_0.10.3.bb => libimxvpuapi_git.bb} (79%)

diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_0.10.3.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
similarity index 79%
rename from recipes-multimedia/libimxvpuapi/libimxvpuapi_0.10.3.bb
rename to recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
index 2ad0c898..540565f6 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_0.10.3.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
@@ -1,3 +1,4 @@
+# Copyright 2018 (C) O.S. Systems Software LTDA.
 DESCRIPTION = "frontend for the i.MX6 VPU hardware video engine"
 HOMEPAGE = "https://github.com/Freescale/libimxvpuapi"
 LICENSE = "LGPLv2.1"
@@ -5,8 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324"
 SECTION = "multimedia"
 DEPENDS = "imx-vpu"
 
+PV = "0.10.3+${SRCPV}"
+
 SRCBRANCH ?= "master"
-SRCREV = "81a2bbd85ef2aaa56243dbf63a7352ca1758099b"
+SRCREV = "4afb52f97e28c731c903a8538bf99e4a6d155b42"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
-- 
2.18.0

[PATCH 09/32] imx-lib: Bump to revision 3f77797

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Update O.S. Systems Software Copyright

This includes the following change:

  - 3f77797 MLK-16374-5: PXP_LIB: configure pxp to be legacy mode

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-bsp/imx-lib/imx-lib_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 8e477de0..466d9c03 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
 # Copyright 2017 NXP
 
 DESCRIPTION = "Platform specific libraries for imx platform"
@@ -13,9 +13,9 @@ PE = "1"
 
 PV = "5.8+${SRCPV}"
 
-SRCBRANCH = "nxp/imx_4.9.11_1.0.0_ga"
+SRCBRANCH = "master"
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "f5f14fc24581e5d6e689f42a56b5f2992f978ef4"
+SRCREV = "3f777974c0c146817e2ff5cb0340ca66a1f99e57"
 
 S = "${WORKDIR}/git"
 
-- 
2.18.0

[PATCH 10/32] gstreamer1.0-plugins-base: Rename patch directory to match recipe name

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 ...001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch | 0
 ...002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 0
 ...003-riff-add-missing-include-directories-when-calling-in.patch | 0
 ...004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base => gstreamer1.0-plugins-base-1.12.imx}/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch (100%)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base => gstreamer1.0-plugins-base-1.12.imx}/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch (100%)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base => gstreamer1.0-plugins-base-1.12.imx}/0003-riff-add-missing-include-directories-when-calling-in.patch (100%)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base => gstreamer1.0-plugins-base-1.12.imx}/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch (100%)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0003-riff-add-missing-include-directories-when-calling-in.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0003-riff-add-missing-include-directories-when-calling-in.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
-- 
2.18.0

[PATCH 11/32] gstreamer1.0-plugins-bad: Rename patch directory to match recipe name

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 ...001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad => gstreamer1.0-plugins-bad-1.12.imx}/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch (100%)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
-- 
2.18.0

[PATCH 12/32] imx-gpu-apitrace: Bump revision to 9281b2c2

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Add O.S. Systems Software Copyright

This includes the following change:

  - 9281b2c2 MGS-3379 [#ccc] Add more support for multilib

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb
index e5e9a4a5..79ef6579 100644
--- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb
@@ -1,10 +1,11 @@
+# Copyright 2018 (C) O.S. Systems Software LTDA.
 SUMMARY = "Samples for OpenGL ES"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50"
 DEPENDS = "virtual/libg2d imx-gpu-viv zlib libpng procps"
 
 SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_7.1"
-SRCREV = "759c5b7a004d1807e15a7f587023dc2e459b3509"
+SRCREV = "9281b2c2f2766caf3529df347289128470318537"
 
 S = "${WORKDIR}/git"
 
-- 
2.18.0

[PATCH 13/32] imx-test: Update to version 7.0

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Remove .inc file to use only one .bb file
  - Add alsa-lib to DEPENDS
  - Add patch to use include path when compile sources from test directory
  - Drop unused patch
  - Update O.S. Systems Software Copyright

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-bsp/imx-test/imx-test.inc             |  72 --------
 ...efiles-to-handle-library-dependencie.patch | 170 ------------------
 ...efile-Add-include-path-to-CC-command.patch |  27 +++
 recipes-bsp/imx-test/imx-test_git.bb          |  84 ++++++++-
 4 files changed, 104 insertions(+), 249 deletions(-)
 delete mode 100644 recipes-bsp/imx-test/imx-test.inc
 delete mode 100644 recipes-bsp/imx-test/imx-test/0001-imx-test-Fix-Makefiles-to-handle-library-dependencie.patch
 create mode 100644 recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
deleted file mode 100644
index 36068892..00000000
--- a/recipes-bsp/imx-test/imx-test.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2015 Freescale Semiconductor
-# Copyright 2017 NXP
-
-SUMMARY = "Test programs for IMX BSP"
-DESCRIPTION = "Unit tests for the IMX BSP"
-SECTION = "base"
-
-DEPENDS_mx6q  = "virtual/kernel imx-lib virtual/imxvpu"
-DEPENDS_mx6dl = "virtual/kernel imx-lib virtual/imxvpu"
-DEPENDS_mx6sl = "virtual/kernel imx-lib"
-DEPENDS_mx6sll = "virtual/kernel imx-lib"
-DEPENDS_mx6sx = "virtual/kernel imx-lib"
-DEPENDS_mx6ul = "virtual/kernel imx-lib"
-DEPENDS_mx7d  = "virtual/kernel imx-lib"
-DEPENDS_mx7ulp = "virtual/kernel imx-lib"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-PE = "1"
-
-inherit module-base
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-PLATFORM_mx6q  = "IMX6Q"
-PLATFORM_mx6dl = "IMX6Q"
-PLATFORM_mx6sl = "IMX6SL"
-PLATFORM_mx6sll = "IMX6SL"
-PLATFORM_mx6sx = "IMX6SX"
-PLATFORM_mx6ul = "IMX6UL"
-PLATFORM_mx7d  = "IMX7D"
-PLATFORM_mx7ulp  = "IMX7D"
-
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
-
-do_compile() {
-    CFLAGS="${TOOLCHAIN_OPTIONS}"
-    oe_runmake V=1 VERBOSE='' \
-               CROSS_COMPILE=${TARGET_PREFIX} \
-               INC="-I${STAGING_INCDIR} \
-                    -I${S}/include \
-                    -I${STAGING_KERNEL_BUILDDIR}/include/uapi \
-                    -I${STAGING_KERNEL_BUILDDIR}/include \
-                    -I${STAGING_KERNEL_DIR}/include/uapi \
-                    -I${STAGING_KERNEL_DIR}/include \
-                    -I${STAGING_KERNEL_DIR}/arch/arm/include \
-                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
-                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \
-               CC="${CC} -L${STAGING_LIBDIR} ${LDFLAGS}" \
-               LINUXPATH=${STAGING_KERNEL_DIR} \
-               KBUILD_OUTPUT=${STAGING_KERNEL_BUILDDIR} \
-               PLATFORM=${PLATFORM}
-}
-
-do_install() {
-    oe_runmake DESTDIR=${D}/unit_tests \
-               PLATFORM=${PLATFORM} \
-               install
-
-    if [ -e ${WORKDIR}/clocks.sh ]; then
-        install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
-    fi
-}
-
-FILES_${PN} += "/unit_tests"
-RDEPENDS_${PN} = "bash"
-
-FILES_${PN}-dbg += "/unit_tests/.debug"
diff --git a/recipes-bsp/imx-test/imx-test/0001-imx-test-Fix-Makefiles-to-handle-library-dependencie.patch b/recipes-bsp/imx-test/imx-test/0001-imx-test-Fix-Makefiles-to-handle-library-dependencie.patch
deleted file mode 100644
index 417e29c3..00000000
--- a/recipes-bsp/imx-test/imx-test/0001-imx-test-Fix-Makefiles-to-handle-library-dependencie.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 251612f51136568331d3cf3826bf08c3f70d7eee Mon Sep 17 00:00:00 2001
-From: Lauren Post <lauren.post@nxp.com>
-Date: Wed, 24 Aug 2016 14:54:33 -0500
-Subject: [PATCH] imx-test:  Fix Makefiles to handle library dependencies
-
-Applications with library dependencies need different handling to pull in both
-CFLAGS and LDFLAGS. Without these changes the library dependencies are not
-linked in correctly causing build breaks.
-
-Signed-off-by: Lauren Post <lauren.post@nxp.com>
----
- test/mxc_cec_test/Makefile       | 13 ++++++++++---
- test/mxc_i2c_slave_test/Makefile | 12 ++++++++++--
- test/mxc_mpeg4_enc_test/Makefile | 18 ++++++------------
- test/pxp_lib_test/Makefile       | 16 ++++++++++------
- test/pxp_v4l2_test/Makefile      | 19 ++++++++++++++++---
- 5 files changed, 52 insertions(+), 26 deletions(-)
-
-diff --git a/test/mxc_cec_test/Makefile b/test/mxc_cec_test/Makefile
-index 8327784..9d7ee9e 100755
---- a/test/mxc_cec_test/Makefile
-+++ b/test/mxc_cec_test/Makefile
-@@ -2,11 +2,18 @@
- # Makefile for MediaLB driver test app.
- #
- INC += -I$(LINUXPATH)/include
--CFLAGS += -lpthread -lcec -lrt
- 
--OBJS = $(OBJDIR)/mxc_cec_test.out
-+TARGET = $(OBJDIR)/mxc_cec_test.out
-+OBJ = mxc_cec_test.o
-+
-+all : $(TARGET)
-+
-+LDFLAGS += -lpthread -lcec -lrt -lstdc++ -pthread
-+
-+$(TARGET):$(OBJ)
-+	$(CC) -o $(TARGET) $(OBJ) $(LDFLAGS) -Os
-+	$(STRIP) $(TARGET)
- 
--all : $(OBJS)
- 
- .PHONY: clean
- clean :
-diff --git a/test/mxc_i2c_slave_test/Makefile b/test/mxc_i2c_slave_test/Makefile
-index 07d0ff1..2b6b8ef 100644
---- a/test/mxc_i2c_slave_test/Makefile
-+++ b/test/mxc_i2c_slave_test/Makefile
-@@ -2,9 +2,17 @@
- 
- CFLAGS += -lpthread
- 
--OBJS = $(OBJDIR)/mxc_i2c_slave_test.out
-+TARGET = $(OBJDIR)/mxc_i2c_slave_test.out
- 
--all : $(OBJS)
-+all : $(TARGET)
-+
-+LDFLAGS += -lpthread -lstdc++ -pthread
-+
-+OBJ = mxc_i2c_slave_test.o
-+
-+$(TARGET):$(OBJ)
-+	$(CC) -o $(TARGET) $(OBJ) $(LDFLAGS) -Os
-+	$(STRIP) $(TARGET)
- 
- .PHONY: clean
- clean :
-diff --git a/test/mxc_mpeg4_enc_test/Makefile b/test/mxc_mpeg4_enc_test/Makefile
-index 842ab58..1de4115 100644
---- a/test/mxc_mpeg4_enc_test/Makefile
-+++ b/test/mxc_mpeg4_enc_test/Makefile
-@@ -6,27 +6,21 @@ CFLAGS += -I . -lpthread
- 
- EXES = $(OBJDIR)/cam2mpeg4.out
- SCRIPTS = $(OBJDIR)/autorun-hantro.sh
--ifeq "$(PLATFORM)" "MXC30030EVB"
--LIBS = libmpeg4enc_cif.a
--TEMP_EXE = $(OBJDIR)/cam2mpeg4_cif.out
--OBJS = $(OBJDIR)/cam2mpeg4_cif.o
--else
- LIBS = libmpeg4enc_vga.a
--TEMP_EXE = $(OBJDIR)/cam2mpeg4_vga.out
--OBJS = $(OBJDIR)/cam2mpeg4_vga.o
--endif
-+OBJS = cam2mpeg4_vga.o
- 
- all: $(EXES) $(SCRIPTS)
- 
--$(EXES): $(TEMP_EXE)
--	@mv $< $@
-+LDFLAGS += -lpthread
-+
-+$(EXES): $(OBJS)
-+	$(CC) -o $(EXES) $(OBJS) libmpeg4enc_vga.a $(LDFLAGS) -Os
-+	$(STRIP) $(EXES)
- 
- .PHONY: clean
- clean:
- 	rm -f $(EXES) $(OBJS) $(SCRIPTS)
- 
--$(TEMP_EXE): $(LIBS)
--
- #
- # include the Rules
- #
-diff --git a/test/pxp_lib_test/Makefile b/test/pxp_lib_test/Makefile
-index 978bea5..c73e4c2 100644
---- a/test/pxp_lib_test/Makefile
-+++ b/test/pxp_lib_test/Makefile
-@@ -1,13 +1,16 @@
- SRCS = pxp_test.c utils.c
--CFLAGS += -lpxp -lpthread
- 
--OBJS = $(OBJDIR)/pxp_test.out \
--	$(OBJDIR)/autorun-pxp.sh
--$(OBJS): $(SRCS)
--	mkdir -p $(OBJDIR)
--	$(VERBOSE) $(CC) -g $(INC) $(CFLAGS) $^ $(LIBS) -o $@
-+TARGET = $(OBJDIR)/pxp_test.out
- 
--all: $(OBJS)
-+all: $(TARGET)
-+
-+OBJ = pxp_test.o utils.o
-+
-+LDFLAGS += -pthread -lpxp -lstdc++ -pthread
-+
-+$(OBJDIR)/pxp_test.out: $(OBJ)
-+	$(CC) -o  $(OBJDIR)/pxp_test.out $(OBJ) $(LDFLAGS) -Os
-+	$(STRIP) $(OBJDIR)/pxp_test.out
- 
- .PHONY: clean
- clean:
-diff --git a/test/pxp_v4l2_test/Makefile b/test/pxp_v4l2_test/Makefile
-index 8f72e63..da83f8a 100644
---- a/test/pxp_v4l2_test/Makefile
-+++ b/test/pxp_v4l2_test/Makefile
-@@ -1,12 +1,25 @@
- # Just use the pxp library to get contiguous physical memory for USERPTR testing
- # However, be aware that this is not the only way.
--CFLAGS += -lpthread -lpxp -DGET_CONTI_PHY_MEM_VIA_PXP_LIB
-+CFLAGS += -DGET_CONTI_PHY_MEM_VIA_PXP_LIB
- 
--OBJS = 	$(OBJDIR)/pxp_v4l2_test.out \
-+TARGET = $(OBJDIR)/pxp_v4l2_test.out \
- 	$(OBJDIR)/pxp_v4l2_out_test.sh \
- 	$(OBJDIR)/mx6s_v4l2_capture.out
- 
--all : $(OBJS)
-+all : $(TARGET)
-+
-+LDFLAGS += -lpthread -lpxp -lstdc++ -pthread
-+
-+$(OBJDIR)/pxp_v4l2_test.out : pxp_v4l2_test.o
-+	$(CC) -o $(OBJDIR)/pxp_v4l2_test.out pxp_v4l2_test.o $(LDFLAGS) -Os
-+	$(STRIP) $(OBJDIR)/pxp_v4l2_test.out
-+
-+$(OBJDIR)/mx6s_v4l2_capture.out : mx6s_v4l2_capture.o
-+	$(CC) -o $(OBJDIR)/mx6s_v4l2_capture.out mx6s_v4l2_capture.o $(LDFLAGS) -Os
-+	$(STRIP) $(OBJDIR)/mx6s_v4l2_capture.out
-+
-+$(OBJDIR)/pxp_v4l2_out_test.sh: pxp_v4l2_out_test.sh
-+	cp pxp_v4l2_out_test.sh $(OBJDIR)
- 
- .PHONY: clean
- clean :
--- 
-1.9.1
-
diff --git a/recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch b/recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch
new file mode 100644
index 00000000..8387a17c
--- /dev/null
+++ b/recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch
@@ -0,0 +1,27 @@
+From d289d905c64882c58e3b99f74f68e72f9100115e Mon Sep 17 00:00:00 2001
+From: Fabio Berton <fabio.berton@ossystems.com.br>
+Date: Tue, 12 Jun 2018 14:58:40 -0300
+Subject: [PATCH] test/Makefile: Add include path to CC command
+Organization: O.S. Systems Software LTDA.
+
+Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+---
+ test/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index f1cfa2a..4f14d2c 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -12,7 +12,7 @@ ALL_OBJS :=
+ 
+ %.o: %.c
+ 	@echo "	CC	$@"
+-	$(Q)$(CC) -c $(CFLAGS) $< -o $@
++	$(Q)$(CC) -c $(CFLAGS) $(INC) $< -o $@
+ 
+ 
+ # This creates the build and copy rules for one executable. Because we
+-- 
+2.17.1
+
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index ddc87a97..94765df4 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -1,16 +1,86 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
+# Copyright (C) 2015 Freescale Semiconductor
 # Copyright 2017 NXP
 
-include imx-test.inc
+SUMMARY = "Test programs for IMX BSP"
+DESCRIPTION = "Unit tests for the IMX BSP"
+SECTION = "base"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-PV = "6.0+${SRCPV}"
+DEPENDS_mx6q  = "virtual/kernel imx-lib virtual/imxvpu"
+DEPENDS_mx6dl = "virtual/kernel imx-lib virtual/imxvpu"
+DEPENDS_mx6sl = "virtual/kernel imx-lib"
+DEPENDS_mx6sll = "virtual/kernel imx-lib"
+DEPENDS_mx6sx = "virtual/kernel imx-lib"
+DEPENDS_mx6ul = "virtual/kernel imx-lib"
+DEPENDS_mx7d  = "virtual/kernel imx-lib"
+DEPENDS_mx7ulp = "virtual/kernel imx-lib"
+DEPENDS_append = " alsa-lib"
 
-PARALLEL_MAKE="-j 1"
+PE = "1"
+PV = "7.0+${SRCPV}"
 
-SRCBRANCH = "nxp/imx_4.9.11_1.0.0_ga"
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "fb250a795ce0d25c19610e9e19e1cd815fc64cb9"
+SRCBRANCH = "imx_4.9.88_2.0.0_ga"
+SRCREV = "1f7da41b3a8d5dff8329d7b01b10d4d71144b43e"
+SRC_URI = " \
+    git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
+    file://0001-test-Makefile-Add-include-path-to-CC-command.patch \
+"
 
 S = "${WORKDIR}/git"
 
+
+inherit module-base
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+PLATFORM_mx6q  = "IMX6Q"
+PLATFORM_mx6dl = "IMX6Q"
+PLATFORM_mx6sl = "IMX6SL"
+PLATFORM_mx6sll = "IMX6SL"
+PLATFORM_mx6sx = "IMX6SX"
+PLATFORM_mx6ul = "IMX6UL"
+PLATFORM_mx7d  = "IMX7D"
+PLATFORM_mx7ulp  = "IMX7D"
+
+PARALLEL_MAKE="-j 1"
+
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
+
+do_compile() {
+    CFLAGS="${TOOLCHAIN_OPTIONS}"
+    oe_runmake V=1 VERBOSE='' \
+               CROSS_COMPILE=${TARGET_PREFIX} \
+               INC="-I${STAGING_INCDIR} \
+                    -I${S}/include \
+                    -I${STAGING_KERNEL_BUILDDIR}/include/uapi \
+                    -I${STAGING_KERNEL_BUILDDIR}/include \
+                    -I${STAGING_KERNEL_DIR}/include/uapi \
+                    -I${STAGING_KERNEL_DIR}/include \
+                    -I${STAGING_KERNEL_DIR}/arch/arm/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \
+               CC="${CC} -L${STAGING_LIBDIR} ${LDFLAGS}" \
+               LINUXPATH=${STAGING_KERNEL_DIR} \
+               KBUILD_OUTPUT=${STAGING_KERNEL_BUILDDIR} \
+               PLATFORM=${PLATFORM}
+}
+
+do_install() {
+    oe_runmake DESTDIR=${D}/unit_tests \
+               PLATFORM=${PLATFORM} \
+               install
+
+    if [ -e ${WORKDIR}/clocks.sh ]; then
+        install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
+    fi
+}
+
+FILES_${PN} += "/unit_tests"
+RDEPENDS_${PN} = "bash"
+
+FILES_${PN}-dbg += "/unit_tests/.debug"
 COMPATIBLE_MACHINE = "(mx6|mx7)"
-- 
2.18.0

[PATCH 14/32] kernel-module-imx-gpu-viv: Update to version 6.2.4.p1.2-based fork

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

This includes the following changes:

    - 8635400 Merge tag 'upstream/6.2.4.p1.2'
    - 9bbacfe Import 6.2.4.p1.2 original version
    - 26c273f Kbuild: fix AQROOT reassignment and remove CONFIG_MXC_GPU_VIV
    - 09b4ae4 Merge tag 'upstream/6.2.4.p1.0'
    - 7957949 Import 6.2.4.p1.0 original version
    - 3b9e057 Merge tag 'upstream/6.2.2.p0'
    - b3604bf Merge pull request #8 from gibsson/upstream
    - 0d83ec5 Import 6.2.2.p0 original version

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 ...6+fslc.bb => kernel-module-imx-gpu-viv_6.2.4.p1.2+fslc.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-kernel/kernel-modules/{kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bb => kernel-module-imx-gpu-viv_6.2.4.p1.2+fslc.bb} (83%)

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2+fslc.bb
similarity index 83%
rename from recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bb
rename to recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2+fslc.bb
index b98ff9cb..19f2dc7f 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2+fslc.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016 O.S. Systems Software LTDA.
+# Copyright (C) 2015-2018 O.S. Systems Software LTDA.
 # Copyright (C) 2015-2016 Freescale Semiconductor
 
 SUMMARY = "Kernel loadable module for Vivante GPU"
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 PV .= "+git${SRCPV}"
 
-SRCREV = "a05d9b23b9902f6ce87d23772de2fdb2ecfb37a7"
+SRCREV = "86354002bea77acd9ce1812712e9d8485b377ec8"
 SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https"
 
 S = "${WORKDIR}/git"
-- 
2.18.0

[PATCH 15/32] kernel-module-imx-gpu-viv: Update to 6.2.4.p1.2

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

As NXP does not offer a specific repository for the kernel-module,
this uses the Linux kernel repository and adds a Makefile on top of
it.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../Add-makefile.patch                        | 326 ++++++++++++++++++
 .../kernel-module-imx-gpu-viv_5.0.11.p8.6.bb  |  19 -
 .../kernel-module-imx-gpu-viv_6.2.2.p0.bb     |  16 -
 .../kernel-module-imx-gpu-viv_6.2.4.p1.2.bb   |  26 ++
 4 files changed, 352 insertions(+), 35 deletions(-)
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/Add-makefile.patch
 delete mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6.bb
 delete mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.2.p0.bb
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2.bb

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/Add-makefile.patch b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/Add-makefile.patch
new file mode 100644
index 00000000..63f408c5
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/Add-makefile.patch
@@ -0,0 +1,326 @@
+Index: git/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ git/Makefile	2017-06-27 12:07:11.931698672 -0500
+@@ -0,0 +1,17 @@
++obj-m := galcore.o
++
++SRC := $(shell pwd)
++
++all:
++	$(MAKE) -C $(KERNEL_SRC) M=$(SRC)/src AQROOT=${PWD}/src
++	cp $(SRC)/src/Module.symvers $(PWD)
++	cp $(SRC)/src/modules.order $(PWD)
++
++modules_install:
++	$(MAKE) -C $(KERNEL_SRC) M=$(SRC)/src modules_install
++
++clean:
++	find . -name '*.o' -delete
++	rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c
++	rm -f Module.markers Module.symvers modules.order
++	rm -rf .tmp_versions Modules.symvers
+Index: git/src/hal/kernel/arch/makefile.linux
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ git/src/hal/kernel/arch/makefile.linux	2017-06-27 11:44:06.004826232 -0500
+@@ -0,0 +1,91 @@
++##############################################################################
++#
++#    The MIT License (MIT)
++#
++#    Copyright (c) 2014 - 2017 Vivante Corporation
++#
++#    Permission is hereby granted, free of charge, to any person obtaining a
++#    copy of this software and associated documentation files (the "Software"),
++#    to deal in the Software without restriction, including without limitation
++#    the rights to use, copy, modify, merge, publish, distribute, sublicense,
++#    and/or sell copies of the Software, and to permit persons to whom the
++#    Software is furnished to do so, subject to the following conditions:
++#
++#    The above copyright notice and this permission notice shall be included in
++#    all copies or substantial portions of the Software.
++#
++#    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++#    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++#    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++#    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++#    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++#    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++#    DEALINGS IN THE SOFTWARE.
++#
++##############################################################################
++#
++#    The GPL License (GPL)
++#
++#    Copyright (C) 2014 - 2017 Vivante Corporation
++#
++#    This program is free software; you can redistribute it and/or
++#    modify it under the terms of the GNU General Public License
++#    as published by the Free Software Foundation; either version 2
++#    of the License, or (at your option) any later version.
++#
++#    This program is distributed in the hope that it will be useful,
++#    but WITHOUT ANY WARRANTY; without even the implied warranty of
++#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#    GNU General Public License for more details.
++#
++#    You should have received a copy of the GNU General Public License
++#    along with this program; if not, write to the Free Software Foundation,
++#    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++#
++##############################################################################
++#
++#    Note: This software is released under dual MIT and GPL licenses. A
++#    recipient may use this file under the terms of either the MIT license or
++#    GPL License. If you wish to use only one license not the other, you can
++#    indicate your decision by deleting one of the above license notices in your
++#    version of this file.
++#
++##############################################################################
++
++
++#
++# Linux build file for architecture dependent kernel HAL layer.
++#
++
++################################################################################
++# Include common definitions.
++
++include $(AQROOT)/makefile.linux.def
++
++################################################################################
++# Define a shortcut for the main target.
++
++STATIC = 1
++TARGET_NAME = libhalarchkernel.a
++
++################################################################################
++# Supply additional include directories.
++
++INCLUDE += -I$(AQROOT)/hal/kernel/inc
++INCLUDE += -I$(AQROOT)/hal/kernel/inc
++INCLUDE += -I$(AQROOT)/hal/kernel
++INCLUDE += -I$(AQROOT)/hal/kernel/arch
++ifeq ($(VIVANTE_ENABLE_VG),1)
++INCLUDE += -I$(AQROOT)/hal/kernel/archvg
++endif
++
++CFLAGS += $(INCLUDE) -Werror -ansi
++
++
++################################################################################
++# Describe object files.
++
++OBJECTS = $(OBJ_DIR)/gc_hal_kernel_context.o \
++          $(OBJ_DIR)/gc_hal_kernel_hardware.o
++
++include $(AQROOT)/common.target
+Index: git/src/hal/kernel/archvg/makefile.linux
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ git/src/hal/kernel/archvg/makefile.linux	2017-06-27 11:44:06.004826232 -0500
+@@ -0,0 +1,91 @@
++##############################################################################
++#
++#    The MIT License (MIT)
++#
++#    Copyright (c) 2014 - 2017 Vivante Corporation
++#
++#    Permission is hereby granted, free of charge, to any person obtaining a
++#    copy of this software and associated documentation files (the "Software"),
++#    to deal in the Software without restriction, including without limitation
++#    the rights to use, copy, modify, merge, publish, distribute, sublicense,
++#    and/or sell copies of the Software, and to permit persons to whom the
++#    Software is furnished to do so, subject to the following conditions:
++#
++#    The above copyright notice and this permission notice shall be included in
++#    all copies or substantial portions of the Software.
++#
++#    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++#    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++#    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++#    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++#    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++#    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++#    DEALINGS IN THE SOFTWARE.
++#
++##############################################################################
++#
++#    The GPL License (GPL)
++#
++#    Copyright (C) 2014 - 2017 Vivante Corporation
++#
++#    This program is free software; you can redistribute it and/or
++#    modify it under the terms of the GNU General Public License
++#    as published by the Free Software Foundation; either version 2
++#    of the License, or (at your option) any later version.
++#
++#    This program is distributed in the hope that it will be useful,
++#    but WITHOUT ANY WARRANTY; without even the implied warranty of
++#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#    GNU General Public License for more details.
++#
++#    You should have received a copy of the GNU General Public License
++#    along with this program; if not, write to the Free Software Foundation,
++#    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++#
++##############################################################################
++#
++#    Note: This software is released under dual MIT and GPL licenses. A
++#    recipient may use this file under the terms of either the MIT license or
++#    GPL License. If you wish to use only one license not the other, you can
++#    indicate your decision by deleting one of the above license notices in your
++#    version of this file.
++#
++##############################################################################
++
++
++#
++# Linux build file for architecture dependent kernel HAL layer.
++#
++
++################################################################################
++# Include common definitions.
++
++include $(AQROOT)/makefile.linux.def
++
++################################################################################
++# Define a shortcut for the main target.
++
++STATIC = 1
++
++TARGET_NAME = libhalarchkernelvg.a
++
++################################################################################
++# Supply additional include directories.
++
++INCLUDE += -I$(AQROOT)/hal/inc
++INCLUDE += -I$(AQROOT)/hal/user
++INCLUDE += -I$(AQROOT)/hal/kernel
++INCLUDE += -I$(AQROOT)/hal/kernel/arch
++ifeq ($(VIVANTE_ENABLE_VG), 1)
++INCLUDE += -I$(AQROOT)/hal/kernel/archvg
++endif
++
++CFLAGS += $(INCLUDE) -Werror -ansi
++
++################################################################################
++# Describe object files.
++
++OBJECTS = $(OBJ_DIR)/gc_hal_kernel_hardware_vg.o \
++          $(OBJ_DIR)/gc_hal_kernel_hardware_command_vg.o
++
++include $(AQROOT)/common.target
+Index: git/src/hal/kernel/makefile.linux
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ git/src/hal/kernel/makefile.linux	2017-06-27 11:44:06.004826232 -0500
+@@ -0,0 +1,107 @@
++##############################################################################
++#
++#    The MIT License (MIT)
++#
++#    Copyright (c) 2014 - 2017 Vivante Corporation
++#
++#    Permission is hereby granted, free of charge, to any person obtaining a
++#    copy of this software and associated documentation files (the "Software"),
++#    to deal in the Software without restriction, including without limitation
++#    the rights to use, copy, modify, merge, publish, distribute, sublicense,
++#    and/or sell copies of the Software, and to permit persons to whom the
++#    Software is furnished to do so, subject to the following conditions:
++#
++#    The above copyright notice and this permission notice shall be included in
++#    all copies or substantial portions of the Software.
++#
++#    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++#    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++#    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++#    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++#    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++#    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++#    DEALINGS IN THE SOFTWARE.
++#
++##############################################################################
++#
++#    The GPL License (GPL)
++#
++#    Copyright (C) 2014 - 2017 Vivante Corporation
++#
++#    This program is free software; you can redistribute it and/or
++#    modify it under the terms of the GNU General Public License
++#    as published by the Free Software Foundation; either version 2
++#    of the License, or (at your option) any later version.
++#
++#    This program is distributed in the hope that it will be useful,
++#    but WITHOUT ANY WARRANTY; without even the implied warranty of
++#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#    GNU General Public License for more details.
++#
++#    You should have received a copy of the GNU General Public License
++#    along with this program; if not, write to the Free Software Foundation,
++#    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++#
++##############################################################################
++#
++#    Note: This software is released under dual MIT and GPL licenses. A
++#    recipient may use this file under the terms of either the MIT license or
++#    GPL License. If you wish to use only one license not the other, you can
++#    indicate your decision by deleting one of the above license notices in your
++#    version of this file.
++#
++##############################################################################
++
++
++#
++# Linux build file for architecture dependent kernel HAL layer.
++#
++#
++
++
++################################################################################
++# Include common definitions.
++
++include $(AQROOT)/makefile.linux.def
++
++################################################################################
++# Define a shortcut for the main target.
++
++STATIC = 1
++TARGET_NAME = libhalkernel.a
++
++################################################################################
++# Supply additional include directories.
++
++INCLUDE += -I$(AQROOT)/hal/kernel/inc
++INCLUDE += -I$(AQROOT)/hal/kernel/inc
++INCLUDE += -I$(AQROOT)/hal/kernel/arch
++INCLUDE += -I$(AQROOT)/hal/kernel
++ifeq ($(VIVANTE_ENABLE_VG),1)
++INCLUDE += -I$(AQROOT)/hal/kernel/archvg
++endif
++INCLUDE += -I$(AQROOT)/hal/os/linux/kernel
++CFLAGS += $(INCLUDE) -Werror -ansi
++
++
++################################################################################
++# Describe object files.
++
++OBJECTS = $(OBJ_DIR)/gc_hal_kernel_command.o \
++          $(OBJ_DIR)/gc_hal_kernel_db.o \
++          $(OBJ_DIR)/gc_hal_kernel_debug.o \
++          $(OBJ_DIR)/gc_hal_kernel_event.o \
++          $(OBJ_DIR)/gc_hal_kernel_heap.o \
++          $(OBJ_DIR)/gc_hal_kernel.o \
++          $(OBJ_DIR)/gc_hal_kernel_mmu.o \
++          $(OBJ_DIR)/gc_hal_kernel_video_memory.o
++
++ifeq ($(VIVANTE_ENABLE_VG),1)
++OBJECTS += \
++		  $(OBJ_DIR)/gc_hal_kernel_command_vg.o \
++		  $(OBJ_DIR)/gc_hal_kernel_interrupt_vg.o \
++		  $(OBJ_DIR)/gc_hal_kernel_mmu_vg.o \
++		  $(OBJ_DIR)/gc_hal_kernel_vg.o
++endif
++
++include $(AQROOT)/common.target
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6.bb
deleted file mode 100644
index 6c9089f7..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2015-2016 Freescale Semiconductor
-
-SUMMARY = "Kernel loadable module for Vivante GPU"
-DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
-allowing flexibility to use an older kernel with a newer graphics release."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
-
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "ed31740763b2aa6d56ecbe64d9cea565"
-SRC_URI[sha256sum] = "3e748fc53ee46ffcf80b94d5f9535c58a3875aa107a3c77b550d8100df15de4f"
-
-do_install_prepend() {
-    install ${B}/kernel-module-imx-gpu-viv-src/Module.symvers ${B}
-}
-
-inherit module
-
-KERNEL_MODULE_AUTOLOAD = "galcore"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.2.p0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.2.p0.bb
deleted file mode 100644
index 8bf61dca..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.2.p0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2015-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-
-SUMMARY = "Kernel loadable module for Vivante GPU"
-DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
-allowing flexibility to use an older kernel with a newer graphics release."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
-
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "c5922730046c159fd5055ad114e027b9"
-SRC_URI[sha256sum] = "01b13fa5e1ab69475ce401e997fe8e42775b7792b1233e871b2b28555f8a3a66"
-
-inherit module
-
-KERNEL_MODULE_AUTOLOAD = "galcore"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2.bb
new file mode 100644
index 00000000..2e59a607
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2.bb
@@ -0,0 +1,26 @@
+# Copyright (C) 2015-2016 Freescale Semiconductor
+# Copyright 2017-2018 NXP
+
+SUMMARY = "Kernel loadable module for Vivante GPU"
+DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
+allowing flexibility to use a newer graphics release with an older kernel."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRCBRANCH = "imx_4.9.88_2.0.0_ga"
+LOCALVERSION = "-${SRCBRANCH}"
+
+KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https"
+SRC_URI = " \
+    ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \
+    file://Add-makefile.patch \
+"
+SRCREV = "5e23f9d6114784d77fd4ed5848953356c3575532"
+
+S = "${WORKDIR}/git"
+
+inherit module
+
+EXTRA_OEMAKE += "CONFIG_MXC_GPU_VIV=m"
+
+KERNEL_MODULE_AUTOLOAD = "galcore"
-- 
2.18.0

[PATCH 16/32] dtc: Add recipe for version 1.4.5

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

We need dtc version 1.4.5 to build u-boot-imx 2017.03, current
version 1.4.6 raise a lot of errors and can't build older U-Boot
version.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 recipes-bsp/u-boot/u-boot-imx_2017.03.bb    |  2 +-
 recipes-kernel/dtc/dtc-145_git.bb           | 12 ++++++++++++
 recipes-kernel/dtc/files/make_install.patch | 17 +++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/dtc/dtc-145_git.bb
 create mode 100644 recipes-kernel/dtc/files/make_install.patch

diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
index 72205676..52ebee99 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
 require recipes-bsp/u-boot/u-boot.inc
 
 PROVIDES += "u-boot"
-DEPENDS_append = "dtc-native"
+DEPENDS_append = "dtc-145-native"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
diff --git a/recipes-kernel/dtc/dtc-145_git.bb b/recipes-kernel/dtc/dtc-145_git.bb
new file mode 100644
index 00000000..afed62fd
--- /dev/null
+++ b/recipes-kernel/dtc/dtc-145_git.bb
@@ -0,0 +1,12 @@
+require recipes-kernel/dtc/dtc.inc
+
+LIC_FILES_CHKSUM = " \
+    file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
+    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c \
+"
+
+SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
+
+S = "${WORKDIR}/git"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-kernel/dtc/files/make_install.patch b/recipes-kernel/dtc/files/make_install.patch
new file mode 100644
index 00000000..ccf17b38
--- /dev/null
+++ b/recipes-kernel/dtc/files/make_install.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate [configuration]
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -168,8 +168,8 @@ install-bin: all $(SCRIPTS)
+ install-lib: all
+ 	@$(VECHO) INSTALL-LIB
+ 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+-	$(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
+-	ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
++	$(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
++	ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib))
+ 	ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT)
+ 	$(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
+ 
-- 
2.18.0

Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

[Mihai Lindner]

Hello,

This patch seems to break building images that use systemd as 
init-manager, dtc-145 conflicts with the actual dtc package. Maybe a bit 
late, as this already landed in master.

Somehow, I'm guessing that through PACKAGE_WRITE_DEPS, systemd pulls in 
qemu, which pulls dtc, and u-boot-imx pulls in dtc-145, resulting in 
"FileExistsError: [Errno 17] File exists" at do_image_wic.

Can this be done by having dtc with 1.4.5 as a version, and setting it 
as preferred in our environment? Or maybe other solutions to this.

Thanks,
Mihai

On 06/25/2018 10:45 PM, Otavio Salvador wrote:
> From: Fabio Berton <fabio.berton@ossystems.com.br>
> 
> We need dtc version 1.4.5 to build u-boot-imx 2017.03, current
> version 1.4.6 raise a lot of errors and can't build older U-Boot
> version.
> 
> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>   recipes-bsp/u-boot/u-boot-imx_2017.03.bb    |  2 +-
>   recipes-kernel/dtc/dtc-145_git.bb           | 12 ++++++++++++
>   recipes-kernel/dtc/files/make_install.patch | 17 +++++++++++++++++
>   3 files changed, 30 insertions(+), 1 deletion(-)
>   create mode 100644 recipes-kernel/dtc/dtc-145_git.bb
>   create mode 100644 recipes-kernel/dtc/files/make_install.patch
> 
> diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> index 72205676..52ebee99 100644
> --- a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> +++ b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> @@ -6,7 +6,7 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
>   require recipes-bsp/u-boot/u-boot.inc
>   
>   PROVIDES += "u-boot"
> -DEPENDS_append = "dtc-native"
> +DEPENDS_append = "dtc-145-native"
>   
>   LICENSE = "GPLv2+"
>   LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> diff --git a/recipes-kernel/dtc/dtc-145_git.bb b/recipes-kernel/dtc/dtc-145_git.bb
> new file mode 100644
> index 00000000..afed62fd
> --- /dev/null
> +++ b/recipes-kernel/dtc/dtc-145_git.bb
> @@ -0,0 +1,12 @@
> +require recipes-kernel/dtc/dtc.inc
> +
> +LIC_FILES_CHKSUM = " \
> +    file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
> +    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c \
> +"
> +
> +SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
> +
> +S = "${WORKDIR}/git"
> +
> +BBCLASSEXTEND = "native nativesdk"
> diff --git a/recipes-kernel/dtc/files/make_install.patch b/recipes-kernel/dtc/files/make_install.patch
> new file mode 100644
> index 00000000..ccf17b38
> --- /dev/null
> +++ b/recipes-kernel/dtc/files/make_install.patch
> @@ -0,0 +1,17 @@
> +Upstream-Status: Inappropriate [configuration]
> +
> +Index: git/Makefile
> +===================================================================
> +--- git.orig/Makefile
> ++++ git/Makefile
> +@@ -168,8 +168,8 @@ install-bin: all $(SCRIPTS)
> + install-lib: all
> + 	@$(VECHO) INSTALL-LIB
> + 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
> +-	$(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
> +-	ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
> ++	$(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
> ++	ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib))
> + 	ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT)
> + 	$(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
> +
> 

Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

[Otavio Salvador]

On Thu, Jun 28, 2018 at 12:33 PM, Mihai Lindner <mihai.lindner@nxp.com> wrote:
> This patch seems to break building images that use systemd as
> init-manager, dtc-145 conflicts with the actual dtc package. Maybe a bit
> late, as this already landed in master.
>
> Somehow, I'm guessing that through PACKAGE_WRITE_DEPS, systemd pulls in
> qemu, which pulls dtc, and u-boot-imx pulls in dtc-145, resulting in
> "FileExistsError: [Errno 17] File exists" at do_image_wic.
>
> Can this be done by having dtc with 1.4.5 as a version, and setting it
> as preferred in our environment? Or maybe other solutions to this.

We can rename the binary to dtc-145 and patch U-Boot to use it. Mind
to prepare a patch?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

[Mihai Lindner]

On 06/28/2018 07:49 PM, Otavio Salvador wrote:
> On Thu, Jun 28, 2018 at 12:33 PM, Mihai Lindner <mihai.lindner@nxp.com> wrote:
>> This patch seems to break building images that use systemd as
>> init-manager, dtc-145 conflicts with the actual dtc package. Maybe a bit
>> late, as this already landed in master.
>>
>> Somehow, I'm guessing that through PACKAGE_WRITE_DEPS, systemd pulls in
>> qemu, which pulls dtc, and u-boot-imx pulls in dtc-145, resulting in
>> "FileExistsError: [Errno 17] File exists" at do_image_wic.
>>
>> Can this be done by having dtc with 1.4.5 as a version, and setting it
>> as preferred in our environment? Or maybe other solutions to this.
> 
> We can rename the binary to dtc-145 and patch U-Boot to use it. Mind
> to prepare a patch?
> 

Digging further into this, I don't think that binary renaming is needed, 
handling the recipe another way will do fine. The actual issue here is 
that we introduce "dtc-145" as a new recipe, with version "git", not as 
version 1.4.5 of dtc.

Also, this change might need to be done differently in sumo vs. master. 
Actually, not at all in sumo, because dtc is already at version 1.4.5 in 
poky. I've just sent a patch for this.

In master, the recipe needs to be handled normally just lower the 
version and set it as preferred, maybe in fsl-default-versions.inc. I'm 
still working on this one.

Thanks,
Mihai

Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

[Ian Coolidge]

[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]

Hi All,

Dumb question, can't we just add dtc_1.4.5.bb and set
PREFERRED_VERSION(sp?). That's what I did before this dtc145_git recipe got
added

On Fri, Jun 29, 2018 at 10:53 AM, Mihai Lindner <mihai.lindner@nxp.com>
wrote:

> On 06/28/2018 07:49 PM, Otavio Salvador wrote:
> > On Thu, Jun 28, 2018 at 12:33 PM, Mihai Lindner <mihai.lindner@nxp.com>
> wrote:
> >> This patch seems to break building images that use systemd as
> >> init-manager, dtc-145 conflicts with the actual dtc package. Maybe a bit
> >> late, as this already landed in master.
> >>
> >> Somehow, I'm guessing that through PACKAGE_WRITE_DEPS, systemd pulls in
> >> qemu, which pulls dtc, and u-boot-imx pulls in dtc-145, resulting in
> >> "FileExistsError: [Errno 17] File exists" at do_image_wic.
> >>
> >> Can this be done by having dtc with 1.4.5 as a version, and setting it
> >> as preferred in our environment? Or maybe other solutions to this.
> >
> > We can rename the binary to dtc-145 and patch U-Boot to use it. Mind
> > to prepare a patch?
> >
>
> Digging further into this, I don't think that binary renaming is needed,
> handling the recipe another way will do fine. The actual issue here is
> that we introduce "dtc-145" as a new recipe, with version "git", not as
> version 1.4.5 of dtc.
>
> Also, this change might need to be done differently in sumo vs. master.
> Actually, not at all in sumo, because dtc is already at version 1.4.5 in
> poky. I've just sent a patch for this.
>
> In master, the recipe needs to be handled normally just lower the
> version and set it as preferred, maybe in fsl-default-versions.inc. I'm
> still working on this one.
>
> Thanks,
> Mihai
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
>

[-- Attachment #2: Type: text/html, Size: 2732 bytes --]

Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

[Otavio Salvador]

On Mon, Jul 2, 2018 at 1:42 PM, Ian Coolidge <ian@boundarydevices.com> wrote:
> Hi All,
>
> Dumb question, can't we just add dtc_1.4.5.bb and set
> PREFERRED_VERSION(sp?). That's what I did before this dtc145_git recipe got
> added

This leaks a BSP dependency over other machines. This cannot be done.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

Re: [PATCH 16/32] dtc: Add recipe for version 1.4.5

[Mihai Lindner]

[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]

What machines? Maybe we can be more specific when setting PREFERRED_VERSION.


Thanks,

Mihai


________________________________
From: Otavio Salvador <otavio.salvador@ossystems.com.br>
Sent: Monday, July 2, 2018 20:09
To: Ian Coolidge
Cc: Mihai Lindner; meta-freescale Mailing List; Otavio Salvador
Subject: Re: [meta-freescale] [PATCH 16/32] dtc: Add recipe for version 1.4.5

On Mon, Jul 2, 2018 at 1:42 PM, Ian Coolidge <ian@boundarydevices.com> wrote:
> Hi All,
>
> Dumb question, can't we just add dtc_1.4.5.bb and set
> PREFERRED_VERSION(sp?). That's what I did before this dtc145_git recipe got
> added

This leaks a BSP dependency over other machines. This cannot be done.

--
Otavio Salvador                             O.S. Systems
https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.ossystems.com.br&data=02%7C01%7Cmihai.lindner%40nxp.com%7C63f50476750a4af26f6208d5e03e896b%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636661481560570704&sdata=Rdbfji7gXLQCRjNPBea3nG8SJaA4B5GJPRAKIESFjws%3D&reserved=0        https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fcode.ossystems.com.br&data=02%7C01%7Cmihai.lindner%40nxp.com%7C63f50476750a4af26f6208d5e03e896b%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636661481560570704&sdata=MfmCJlEIYvEzV%2FgjVViDEH5Ekjb0pOkisbe2j0LOYG0%3D&reserved=0
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

[-- Attachment #2: Type: text/html, Size: 3604 bytes --]

[PATCH 17/32] gstreamer1.0-plugins-base: Update release to 4.9.88

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb
index 26d1df50..3a8fd7b9 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
                     file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
 
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.03.04_1801_L4.9.51_MX8M_GA"
+SRCBRANCH = "MM_04.03.05_1804_L4.9.88_MX7ULP_GA"
 
 SRC_URI = " \
     ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
@@ -16,7 +16,7 @@ SRC_URI = " \
     file://0003-riff-add-missing-include-directories-when-calling-in.patch \
     file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
 "
-SRCREV = "3a615cab2e22e133048157ba107dc6c24e08c7e0"
+SRCREV = "7b637f65e7ce2b03c5adb7624501e74c575ac0f2"
 
 EXTRA_AUTORECONF = ""
 
-- 
2.18.0

[PATCH 18/32] gstreamer1.0-plugins-bad: Update release to 4.9.88

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../gstreamer/gstreamer1.0-plugins-bad_1.12.imx.bb            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.imx.bb
index 4343357d..91212485 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.imx.bb
@@ -27,14 +27,14 @@ EXTRA_OECONF_remove = " --disable-sdl --disable-nas --disable-libvisual --disabl
 "
 
 GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.03.04_1801_L4.9.51_MX8M_GA"
+SRCBRANCH = "MM_04.03.05_1804_L4.9.88_MX7ULP_GA"
 
 SRC_URI = " \
     ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \
     file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
 "
 
-SRCREV = "a755b8a4570265a041ec0867629c6bade338b4d9"
+SRCREV = "3bf09ef9cda8220b53459b45fe5384a99a7b1c6b"
 
 # This remove "--exclude=autopoint" option from autoreconf argument to avoid
 # configure.ac:30: error: required file './ABOUT-NLS' not found
-- 
2.18.0

[PATCH 19/32] xf86-video-imxfb-vivante: Update to version 6.2.4.p1

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

 - Remove .inc file to use only one .bb file
 - Update O.S. Systems License
 - Remove unused patch
 - Set SDKTARGETSYSROOT to use STAGING_DIR_HOST
 - Remove unnecessary CFLAGS

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 ...top-using-Git-to-write-local-version.patch | 87 -------------------
 .../xf86-video-imxfb-vivante_6.2.2.p0.bb      |  9 --
 ...=> xf86-video-imxfb-vivante_6.2.4.p1.2.bb} | 34 +++-----
 3 files changed, 13 insertions(+), 117 deletions(-)
 delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
 delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
 rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante.inc => xf86-video-imxfb-vivante_6.2.4.p1.2.bb} (66%)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
deleted file mode 100644
index f541e5c1..00000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 69a92f4576a1e789ba2fcf957164d2c4013020c5 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Wed, 2 Dec 2015 13:36:25 +0000
-Subject: [PATCH] Stop using Git to write local version
-Organization: O.S. Systems Software LTDA.
-
-The standard version does not use a Git repository so we should not
-use Git to identify the commit of the build as it can end getting the
-version from a wrong repository and can be misleading.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- EXA/src/makefile.tc         | 6 +++---
- FslExt/src/makefile.tc      | 6 +++---
- util/autohdmi/makefile.tc   | 6 +++---
- util/pandisplay/makefile.tc | 6 +++---
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/EXA/src/makefile.tc b/EXA/src/makefile.tc
-index 0b9a9e6..ec6e68d 100644
---- a/EXA/src/makefile.tc
-+++ b/EXA/src/makefile.tc
-@@ -52,8 +52,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/FslExt/src/makefile.tc b/FslExt/src/makefile.tc
-index 0b9a9e6..ec6e68d 100644
---- a/FslExt/src/makefile.tc
-+++ b/FslExt/src/makefile.tc
-@@ -52,8 +52,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/util/autohdmi/makefile.tc b/util/autohdmi/makefile.tc
-index c9de0a6..d0a468c 100644
---- a/util/autohdmi/makefile.tc
-+++ b/util/autohdmi/makefile.tc
-@@ -64,8 +64,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/util/pandisplay/makefile.tc b/util/pandisplay/makefile.tc
-index 28732b9..bf54c20 100644
---- a/util/pandisplay/makefile.tc
-+++ b/util/pandisplay/makefile.tc
-@@ -64,8 +64,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
--- 
-2.1.4
-
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
deleted file mode 100644
index 5514962f..00000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
-# Copyright 2017 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require xf86-video-imxfb-vivante.inc
-
-SRCBRANCH = "nxp/imx_4.9.11_1.0.0_ga"
-SRCREV = "07ef065dfe09f1c05a1a188c371577faa3677a17"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb
similarity index 66%
rename from recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
rename to recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb
index c16da671..04ae36cf 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb
@@ -1,5 +1,6 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
-# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
+# Copyright 2017-2018 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 require recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -12,6 +13,8 @@ DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv virtua
 
 LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3"
 
+SRCREV = "946e8603ed9a52f36d305405dbb2ab8ff90943d0"
+SRCBRANCH = "imx_exa_viv6_g2d"
 SRC_URI = "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \
            file://rc.autohdmi"
 
@@ -21,36 +24,25 @@ INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi"
 INITSCRIPT_NAME = "rc.autohdmi"
 INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
 
-EXTRA_OEMAKE += "prefix=${D}/usr \
+EXTRA_OEMAKE += "prefix=${exec_prefix} \
                  sysroot=${STAGING_DIR_TARGET} \
+                 SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
                  LFLAGS="${LDFLAGS}" \
                  BUSID_HAS_NUMBER=1 \
                  BUILD_IN_YOCTO=1 \
                  XSERVER_GREATER_THAN_13=1"
 
-CFLAGS += "-I${STAGING_INCDIR}/xorg \
-           -I${STAGING_INCDIR}/drm \
-           -I../../DRI_1.10.4/src"
-
 PACKAGES =+ "xserver-xorg-extension-viv-autohdmi"
 
-# FIXME: The Freescale provided Makefile has hardcodec include paths
-#        and this does not work in case prefix is different than /usr,
-#        sed it.
-do_configure_prepend () {
-    sed -i 's,$(sysroot)/usr/include,${STAGING_INCDIR},g' \
-            ${S}EXA/src/makefile.linux
-}
-
 do_install_append () {
-	install -d ${D}${includedir}
-	cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir}
-	cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir}
+    install -d ${D}${includedir}
+    cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir}
+    cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir}
 
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 755 ${WORKDIR}/rc.autohdmi ${D}/${sysconfdir}/init.d/rc.autohdmi
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 755 ${WORKDIR}/rc.autohdmi ${D}/${sysconfdir}/init.d/rc.autohdmi
 
-	find ${D}${includedir} -type f -exec chmod 660 {} \;
+    find ${D}${includedir} -type f -exec chmod 660 {} \;
 }
 
 RDEPENDS_${PN} += "libvivante-dri-imx \
-- 
2.18.0

Re: [PATCH 19/32] xf86-video-imxfb-vivante: Update to version 6.2.4.p1

[Gary Bisson]

Hi Fabio,

On Mon, Jun 25, 2018 at 04:30:19PM -0300, Otavio Salvador wrote:
> From: Fabio Berton <fabio.berton@ossystems.com.br>
> 
>  - Remove .inc file to use only one .bb file
>  - Update O.S. Systems License
>  - Remove unused patch
>  - Set SDKTARGETSYSROOT to use STAGING_DIR_HOST
>  - Remove unnecessary CFLAGS
> 
> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>  ...top-using-Git-to-write-local-version.patch | 87 -------------------
>  .../xf86-video-imxfb-vivante_6.2.2.p0.bb      |  9 --
>  ...=> xf86-video-imxfb-vivante_6.2.4.p1.2.bb} | 34 +++-----
>  3 files changed, 13 insertions(+), 117 deletions(-)
>  delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
>  delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
>  rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante.inc => xf86-video-imxfb-vivante_6.2.4.p1.2.bb} (66%)

Minor remark on this patch, your title is missing a ".2" at the end,
otherwise doesn't match the version you bump to.

Regards,
Gary

[PATCH 20/32] imx-gst1.0-plugin: Update to MM_04.03.05_1804_L4.9.88_MX7ULP_GA

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 ...{imx-gst1.0-plugin_4.3.4.bb => imx-gst1.0-plugin_4.3.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-multimedia/gstreamer/{imx-gst1.0-plugin_4.3.4.bb => imx-gst1.0-plugin_4.3.5.bb} (97%)

diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.4.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.5.bb
similarity index 97%
rename from recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.4.bb
rename to recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.5.bb
index d166ec36..98e9efb3 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.4.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.5.bb
@@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 
 IMXGST_SRC ?= "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https"
-SRCBRANCH = "MM_04.03.04_1801_L4.9.51_MX8M_GA"
+SRCBRANCH = "MM_04.03.05_1804_L4.9.88_MX7ULP_GA"
 
 SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}"
-SRCREV = "bd40c49abd6494c6439f37c8c7ec5e275576c761"
+SRCREV = "38d026ed5269f7d61b8adb585f2d8aea86d9c4d7"
 
 S = "${WORKDIR}/git"
 
-- 
2.18.0

[PATCH 21/32] gstreamer1.0-plugins-imx: Bump to revision 963aea6

[Otavio Salvador]

From: Fabio Berton <fabio.berton@ossystems.com.br>

  - Rename recipe to use git package name
  - Set PV to use latest version plus git revision
  - Add O.S. Systems License

This commit includes the following changes:

    - 963aea6 Merge pull request #180 from clopez/bug-179
    - 81d3233 Merge pull request #188 from dougnazar/fixes
    - 68715a6 g2dpango: Add missing header and cleanup a few warnings
    - f4aa2db audio: Save codec_data
    - 2b2edd7 Endless loop at gst_imx_vpu_decoder_finish() when in no_wait mode (#179)
    - ecd884a v4l2: Add phys mem meta only if the driver/card is known to support this
    - 9772200 ipu: Reintroduce interlace methods
    - 3404b56 v4l2video: Define V4L2_COLORSPACE_DEFAULT if it doesn't exist

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 ...plugins-imx_0.13.0.bb => gstreamer1.0-plugins-imx_git.bb} | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-imx_0.13.0.bb => gstreamer1.0-plugins-imx_git.bb} (96%)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb
similarity index 96%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.0.bb
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb
index efd4ee19..050dd94b 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb
@@ -1,3 +1,4 @@
+# Copyright (C) 2018 O.S. Systems Software LTDA.
 DESCRIPTION = "GStreamer 1.0 plugins for i.MX platforms"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
@@ -13,8 +14,10 @@ RDEPENDS_gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-good"
 RDEPENDS_gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers"
 RDEPENDS_gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad"
 
+PV = "0.13.0+git${SRCPV}"
+
 SRCBRANCH ?= "master"
-SRCREV = "048d596dfc657f16d235029c39221b0a118e5c87"
+SRCREV = "963aea60b135d40236411357eb0b2de15eac9af5"
 SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
-- 
2.18.0

[PATCH 22/32] weston: Fix PREFERRED_VERSION_weston

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

It seems that overrides from MACHINEOVERRIDES_EXTENDER are not
available here.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index ab9fcf30..472bcde7 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -218,7 +218,8 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6ul = ""
 PREFERRED_PROVIDER_virtual/libg2d_mx6ull = ""
 PREFERRED_PROVIDER_virtual/libg2d_mx7ulp ?= "imx-gpu-viv"
 
-PREFERRED_VERSION_weston_imxgpu2d = "2.0.0"
+PREFERRED_VERSION_weston_mx6 ?= "2.0.0"
+PREFERRED_VERSION_weston_mx7 ?= "2.0.0"
 
 # Handle default kernel
 IMX_DEFAULT_KERNEL = "linux-imx"
-- 
2.18.0

[PATCH 23/32] xf86-video-imx-vivante: Remove fb from name

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

The driver is no longer only for framebuffer, so
remove the designation from the name.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc                               | 2 +-
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc                  | 2 +-
 .../rc.autohdmi                                                 | 0
 ...vante_6.2.4.p1.2.bb => xf86-video-imx-vivante_6.2.4.p1.2.bb} | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante => xf86-video-imx-vivante}/rc.autohdmi (100%)
 rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_6.2.4.p1.2.bb => xf86-video-imx-vivante_6.2.4.p1.2.bb} (100%)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 472bcde7..916e16bd 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -31,7 +31,7 @@ UBOOT_ENTRYPOINT_vf = "0x80008000"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER_DRIVER = "xf86-video-fbdev"
-XSERVER_DRIVER_imxgpu2d = "xf86-video-imxfb-vivante"
+XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante"
 XSERVER_DRIVER_vf = "xf86-video-modesetting"
 XSERVER_DRIVER_use-mainline-bsp = "xf86-video-armada"
 XSERVER = "xserver-xorg \
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 f47bd973..b97d7c35 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -331,7 +331,7 @@ RDEPENDS_libvivante-dri-imx = "libdrm"
 INSANE_SKIP_libwayland-viv-imx += "dev-so"
 FILES_libwayland-viv-imx =  "${libdir}/libwayland-viv${REALSOLIBS}  ${libdir}/libwayland-viv${SOLIBS}"
 FILES_libwayland-viv-imx-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
-RPROVIDES_libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imxfb-vivante', '', d)}"
+RPROVIDES_libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imx-vivante', '', d)}"
 
 INSANE_SKIP_libgc-wayland-protocol-imx += "dev-so"
 FILES_libgc-wayland-protocol-imx = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi b/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi
similarity index 100%
rename from recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi
rename to recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
similarity index 100%
rename from recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb
rename to recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
-- 
2.18.0

[PATCH 24/32] imx-base.inc: Improve formatting

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 55 +++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 916e16bd..87cb0b73 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -56,16 +56,16 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
 
 INHERIT += "machine-overrides-extender"
 
-MACHINEOVERRIDES_EXTENDER_mx25  = "use-mainline-bsp"
-MACHINEOVERRIDES_EXTENDER_mx6q  = "imxipu:imxvpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu2d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sll  = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp"
+MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
+MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
 MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7d  = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7ulp  = "imxpxp:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
 
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
     mx6 \
@@ -100,13 +100,40 @@ MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
 MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
-MACHINE_SOCARCH_FILTER_append_imx = " alsa-lib"
-MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser"
-MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango weston gstreamer1.0-plugins-bad"
-MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser"
+MACHINE_SOCARCH_FILTER_append_imx = " \
+    alsa-lib \
+"
+MACHINE_SOCARCH_FILTER_append_imxvpu = " \
+    imx-codec \
+    imx-parser \
+    imx-vpu \
+    imx-vpuwrap \
+    libimxvpuapi \
+"
+MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
+    virtual/egl \
+    virtual/mesa \
+    virtual/libg2d \
+    virtual/libgl \
+    virtual/libgles1 \
+    virtual/libgles2 \
+    virtual/libopenvg \
+    cairo \
+    gstreamer1.0-plugins-bad \
+    pango \
+    weston \
+"
 MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
+    virtual/egl \
+    virtual/libopenvg \
+    virtual/libg2d \
+    virtual/libgl \
+    virtual/libgles1 \
+    virtual/libgles2 \
+    virtual/mesa \
+    cairo \
+    pango \
     qtbase \
-    virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango \
 "
 
 INHERIT += "fsl-dynamic-packagearch"
-- 
2.18.0

[PATCH 25/32] imx-dpu-g2d: Add new G2D implementation based on DPU

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb          | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb

diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
new file mode 100644
index 00000000..8abbfad8
--- /dev/null
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
@@ -0,0 +1,37 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2018 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "G2D graphics library and apps for i.MX with DRM"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
+
+RDEPENDS_${PN} = "virtual/libgal-x11 libdrm"
+
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+inherit fsl-eula-unpack
+
+SRC_URI[md5sum] = "9beeb2c66f1bad4e82a77487486a31c8"
+SRC_URI[sha256sum] = "905e797d7fb573b5fea616940b07dc15d817fe2f5e94668f883e9faaa516989a"
+
+do_install () {
+
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+
+    cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
+    cp -r ${S}/gpu-demos/opt ${D}
+}
+
+INSANE_SKIP_${PN} += "ldflags"
+
+FILES_${PN} = "${libdir}/libg2d* /opt"
+FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
+
+COMPATIBLE_MACHINE = "(mx8)"
-- 
2.18.0

Re: [PATCH 25/32] imx-dpu-g2d: Add new G2D implementation based on DPU

[Gary Bisson]

Hi Otavio, Tom,

On Mon, Jun 25, 2018 at 04:30:25PM -0300, Otavio Salvador wrote:
> From: Tom Hochstein <tom.hochstein@nxp.com>
> 
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>  .../imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb          | 37 +++++++++++++++++++
>  1 file changed, 37 insertions(+)
>  create mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
> 
> diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
> new file mode 100644
> index 00000000..8abbfad8
> --- /dev/null
> +++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
> @@ -0,0 +1,37 @@
> +# Copyright (C) 2016 Freescale Semiconductor
> +# Copyright 2017-2018 NXP
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +DESCRIPTION = "G2D graphics library and apps for i.MX with DRM"
> +LICENSE = "Proprietary"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
> +
> +RDEPENDS_${PN} = "virtual/libgal-x11 libdrm"
> +
> +PROVIDES += "virtual/libg2d"
> +
> +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
> +
> +S="${WORKDIR}/${PN}-${PV}"
> +
> +inherit fsl-eula-unpack
> +
> +SRC_URI[md5sum] = "9beeb2c66f1bad4e82a77487486a31c8"
> +SRC_URI[sha256sum] = "905e797d7fb573b5fea616940b07dc15d817fe2f5e94668f883e9faaa516989a"
> +
> +do_install () {
> +
> +    install -d ${D}${libdir}
> +    install -d ${D}${includedir}
> +
> +    cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir}
> +    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
> +    cp -r ${S}/gpu-demos/opt ${D}
> +}
> +
> +INSANE_SKIP_${PN} += "ldflags"
> +
> +FILES_${PN} = "${libdir}/libg2d* /opt"
> +FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
> +
> +COMPATIBLE_MACHINE = "(mx8)"

Shouldn't the compatible be more specific here to only match platforms
that actually have a DPU? mx8m for instance should be excluded.

Regards,
Gary

Re: [PATCH 25/32] imx-dpu-g2d: Add new G2D implementation based on DPU

[Otavio Salvador]

On Mon, Jun 25, 2018 at 5:24 PM, Gary Bisson
<gary.bisson@boundarydevices.com> wrote:
> On Mon, Jun 25, 2018 at 04:30:25PM -0300, Otavio Salvador wrote:
>> From: Tom Hochstein <tom.hochstein@nxp.com>
>>
>> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>
>>  .../imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb          | 37 +++++++++++++++++++
>>  1 file changed, 37 insertions(+)
>>  create mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
>>
>> diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
>> new file mode 100644
>> index 00000000..8abbfad8
>> --- /dev/null
>> +++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
>> @@ -0,0 +1,37 @@
>> +# Copyright (C) 2016 Freescale Semiconductor
>> +# Copyright 2017-2018 NXP
>> +# Released under the MIT license (see COPYING.MIT for the terms)
>> +
>> +DESCRIPTION = "G2D graphics library and apps for i.MX with DRM"
>> +LICENSE = "Proprietary"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
>> +
>> +RDEPENDS_${PN} = "virtual/libgal-x11 libdrm"
>> +
>> +PROVIDES += "virtual/libg2d"
>> +
>> +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
>> +
>> +S="${WORKDIR}/${PN}-${PV}"
>> +
>> +inherit fsl-eula-unpack
>> +
>> +SRC_URI[md5sum] = "9beeb2c66f1bad4e82a77487486a31c8"
>> +SRC_URI[sha256sum] = "905e797d7fb573b5fea616940b07dc15d817fe2f5e94668f883e9faaa516989a"
>> +
>> +do_install () {
>> +
>> +    install -d ${D}${libdir}
>> +    install -d ${D}${includedir}
>> +
>> +    cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir}
>> +    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
>> +    cp -r ${S}/gpu-demos/opt ${D}
>> +}
>> +
>> +INSANE_SKIP_${PN} += "ldflags"
>> +
>> +FILES_${PN} = "${libdir}/libg2d* /opt"
>> +FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
>> +
>> +COMPATIBLE_MACHINE = "(mx8)"
>
> Shouldn't the compatible be more specific here to only match platforms
> that actually have a DPU? mx8m for instance should be excluded.

Yes, Moved to mx8mm and rebased the rest of patches. Master-next synced.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

[PATCH 26/32] imx-gpu-viv: Rename package for libgal

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Change virtual/libgal-x11 to libgal-imx since there are
no other providers and it is not X11-specific.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc                               | 1 +
 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb               | 2 +-
 recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb          | 2 +-
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc                  | 2 +-
 .../xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb            | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 87cb0b73..419ab1bc 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -120,6 +120,7 @@ MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
     virtual/libopenvg \
     cairo \
     gstreamer1.0-plugins-bad \
+    libgal-imx \
     pango \
     weston \
 "
diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
index 8abbfad8..76cb5f9b 100644
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "G2D graphics library and apps for i.MX with DRM"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
 
-RDEPENDS_${PN} = "virtual/libgal-x11 libdrm"
+RDEPENDS_${PN} = "libgal-imx libdrm"
 
 PROVIDES += "virtual/libg2d"
 
diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
index 88130705..eab1d31b 100644
--- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
+++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "G2D graphics library and apps for i.MX 6 and i.MX 7 GPU"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d"
 
-DEPENDS += "virtual/libgal-x11"
+DEPENDS += "libgal-imx"
 PROVIDES += "virtual/libg2d"
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
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 b97d7c35..6cc8cbb1 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -32,7 +32,7 @@ EXTRA_PROVIDES_append_imxgpu3d = " \
 "
 PROVIDES += " \
     imx-gpu-viv \
-    virtual/libgal-x11 \
+    libgal-imx \
     opencl-headers \
     virtual/egl \
     virtual/libopenvg \
diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
index 04ae36cf..fa3a1a35 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
@@ -9,7 +9,7 @@ PE = "3"
 
 inherit autotools-brokensep update-rc.d pkgconfig
 
-DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv virtual/libg2d pixman"
+DEPENDS += "virtual/xserver virtual/libx11 libgal-imx imx-gpu-viv virtual/libg2d pixman"
 
 LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3"
 
-- 
2.18.0

[PATCH 27/32] imx-gpu-viv: Add i.MX 8 support

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../imx-gpu-viv/imx-gpu-viv-6.inc             | 37 ++++++++++++++++---
 .../imx-gpu-viv_6.2.4.p1.2-aarch64.bb         |  6 +++
 2 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 6cc8cbb1..d5023bdf 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -12,11 +12,11 @@ DEPENDS += " \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
                                                        '', d), d)} \
 "
-DEPENDS += "libdrm"
 DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
                                                        '', d)} \
 "
+DEPENDS_append_mx8 = " libdrm wayland"
 
 # imx-gpu-viv does not provide everything it needs to for virtual/libgl
 # on x11 backend or on Wayland backend with XWayland support.
@@ -29,6 +29,8 @@ EXTRA_PROVIDES_append_imxgpu3d = " \
     virtual/libgles1 \
     virtual/libgles2 \
 "
+EXTRA_PROVIDES_append_mx8 = " \
+    virtual/libopenvx \
 "
 PROVIDES += " \
     imx-gpu-viv \
@@ -51,6 +53,8 @@ inherit fsl-eula-unpack
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
+IMX_PACKAGES_GBM     = ""
+IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev"
 PACKAGES =+ "libclc-imx libclc-imx-dev \
 	libgl-imx libgl-imx-dev \
 	libgles-imx libgles-imx-dev \
@@ -64,7 +68,7 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \
 	libgal-imx libgal-imx-dev \
 	libvivante-dri-imx \
 	libvsc-imx \
-	libgbm-imx libgbm-imx-dev \
+	${IMX_PACKAGES_GBM} \
 	libwayland-viv-imx libwayland-viv-imx-dev \
 	libgc-wayland-protocol-imx libgc-wayland-protocol-imx-dev \
 	libwayland-egl-imx-dev \
@@ -122,9 +126,19 @@ python __anonymous() {
 IS_MX6SL = "0"
 IS_MX6SL_mx6sl = "1"
 
+IS_MX8 = "0"
+IS_MX8_mx8 = "1"
+
 PACKAGE_FP_TYPE = "hardfp"
 
+HAS_GBM     = "false"
+HAS_GBM_mx8 = "true"
+
+# GLES 3.1 is supported for all i.MX 8
+# GLES 3.2 is supported for i.MX 8QM only
 GLES3_HEADER_REMOVALS = "gl31.h gl32.h"
+GLES3_HEADER_REMOVALS_remove_mx8   = "gl31.h"
+GLES3_HEADER_REMOVALS_remove_mx8qm = "gl32.h"
 
 do_install () {
     install -d ${D}${libdir}
@@ -140,6 +154,9 @@ do_install () {
     rm -rf ${D}${includedir}/vulkan/vulkan.h
 
     install -d ${D}${libdir}/pkgconfig
+    if ${HAS_GBM}; then
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
+    fi
 
     # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb
     if [ "${USE_WL}" = "yes" ]; then
@@ -212,6 +229,14 @@ do_install () {
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
 
+    if [ "${IS_MX8}" = "1" ]; then
+        # Install the vulkan driver in a sub-folder. When installed in the same
+        # folder as the vulkan loader layer library, an incorrect linkage is
+        # created from libvulkan.so.1 to our library instead of the loader
+        # layer library.
+        install -d ${D}${libdir}/vulkan
+        mv ${D}${libdir}/libvulkan-${backend}.so ${D}${libdir}/vulkan/libvulkan_VSI.so
+    fi
     for header in ${GLES3_HEADER_REMOVALS}; do
         rm -f ${D}${includedir}/GLES3/${header}
     done
@@ -276,9 +301,9 @@ INSANE_SKIP_libgal-imx += "build-deps"
 
 FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}"
 
-FILES_libgbm-imx = "${libdir}/libgbm${SOLIBS} ${libdir}/gbm_viv${SOLIBS}"
-FILES_libgbm-imx-dev = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}"
-RDEPENDS_libgbm-imx += "libdrm"
+FILES_libgbm-imx_mx8           = "${libdir}/libgbm${SOLIBS} ${libdir}/gbm_viv${SOLIBS}"
+FILES_libgbm-imx-dev_mx8       = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}"
+RDEPENDS_libgbm-imx_append_mx8 = " libdrm"
 
 FILES_libvulkan-imx = "${libdir}/vulkan/libvulkan_VSI${SOLIBS}"
 FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/vulkan/libvulkan_VSI${SOLIBSDEV}"
@@ -344,4 +369,4 @@ FILES_imx-gpu-viv-tools = "${bindir}/gmem_info"
 FILES_imx-gpu-viv-demos = "/opt"
 INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps"
 
-# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl)"
+# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb
new file mode 100644
index 00000000..4b1a72ca
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb
@@ -0,0 +1,6 @@
+require imx-gpu-viv-6.inc
+
+SRC_URI[md5sum] = "28ef177f53be40c738f46018cebf055c"
+SRC_URI[sha256sum] = "27ed3f58681cef18f87ea20946cc89b2cef4848006064303d20583e6ed7aeec7"
+
+COMPATIBLE_MACHINE = "(mx8)"
-- 
2.18.0

Re: [PATCH 27/32] imx-gpu-viv: Add i.MX 8 support

[Gary Bisson]

Hi Otavio, Tom,

On Mon, Jun 25, 2018 at 04:30:27PM -0300, Otavio Salvador wrote:
> From: Tom Hochstein <tom.hochstein@nxp.com>
> 
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>  .../imx-gpu-viv/imx-gpu-viv-6.inc             | 37 ++++++++++++++++---
>  .../imx-gpu-viv_6.2.4.p1.2-aarch64.bb         |  6 +++
>  2 files changed, 37 insertions(+), 6 deletions(-)
>  create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb
> 
> diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
> index 6cc8cbb1..d5023bdf 100644
> --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
> +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
> @@ -12,11 +12,11 @@ DEPENDS += " \
>         bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
>                                                         '', d), d)} \
>  "
> -DEPENDS += "libdrm"
>  DEPENDS += " \
>      ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
>                                                         '', d)} \
>  "
> +DEPENDS_append_mx8 = " libdrm wayland"
>  
>  # imx-gpu-viv does not provide everything it needs to for virtual/libgl
>  # on x11 backend or on Wayland backend with XWayland support.
> @@ -29,6 +29,8 @@ EXTRA_PROVIDES_append_imxgpu3d = " \
>      virtual/libgles1 \
>      virtual/libgles2 \
>  "
> +EXTRA_PROVIDES_append_mx8 = " \
> +    virtual/libopenvx \

Isn't OpenVx only available on i.MX8QM? Same I think it'd be better not
to expose openvx for imx8mq since it's not supported.
https://www.nxp.com/products/processors-and-microcontrollers/applications-processors/i.mx-applications-processors/i.mx-8-processors:IMX8-SERIES

Also, it seems the i.MX8M Mini only supports OpenGL ES 2.0, not 3.1 and
that Vulkan isn't supported either.

I know it complexifies the recipe but it still should matches what the
HW is capable of, otherwise users will be lost.

To be honest I'd leave i.MX8M Mini out of the picture for now since only
the i.MX8MQ is publicly available.

Regards,
Gary

Re: [PATCH 27/32] imx-gpu-viv: Add i.MX 8 support

[Otavio Salvador]

Hello,

On Tue, Jun 26, 2018 at 5:12 AM, Gary Bisson
<gary.bisson@boundarydevices.com> wrote:
> Hi Otavio, Tom,
>
> On Mon, Jun 25, 2018 at 04:30:27PM -0300, Otavio Salvador wrote:
>> From: Tom Hochstein <tom.hochstein@nxp.com>
>>
>> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>
>>  .../imx-gpu-viv/imx-gpu-viv-6.inc             | 37 ++++++++++++++++---
>>  .../imx-gpu-viv_6.2.4.p1.2-aarch64.bb         |  6 +++
>>  2 files changed, 37 insertions(+), 6 deletions(-)
>>  create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb
>>
>> diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
>> index 6cc8cbb1..d5023bdf 100644
>> --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
>> +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
>> @@ -12,11 +12,11 @@ DEPENDS += " \
>>         bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
>>                                                         '', d), d)} \
>>  "
>> -DEPENDS += "libdrm"
>>  DEPENDS += " \
>>      ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
>>                                                         '', d)} \
>>  "
>> +DEPENDS_append_mx8 = " libdrm wayland"
>>
>>  # imx-gpu-viv does not provide everything it needs to for virtual/libgl
>>  # on x11 backend or on Wayland backend with XWayland support.
>> @@ -29,6 +29,8 @@ EXTRA_PROVIDES_append_imxgpu3d = " \
>>      virtual/libgles1 \
>>      virtual/libgles2 \
>>  "
>> +EXTRA_PROVIDES_append_mx8 = " \
>> +    virtual/libopenvx \
>
> Isn't OpenVx only available on i.MX8QM? Same I think it'd be better not
> to expose openvx for imx8mq since it's not supported.
> https://www.nxp.com/products/processors-and-microcontrollers/applications-processors/i.mx-applications-processors/i.mx-8-processors:IMX8-SERIES
>
> Also, it seems the i.MX8M Mini only supports OpenGL ES 2.0, not 3.1 and
> that Vulkan isn't supported either.
>
> I know it complexifies the recipe but it still should matches what the
> HW is capable of, otherwise users will be lost.
>
> To be honest I'd leave i.MX8M Mini out of the picture for now since only
> the i.MX8MQ is publicly available.

Agreed. Could you guys prepare a patch on top of this to merge?

I am intending to finish the upgrade of SDK and leave imx8 for a
second step so we can work in a smaller patchset.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

Re: [PATCH 27/32] imx-gpu-viv: Add i.MX 8 support

[Tom Hochstein]

Thanks Gary, Otavio, I'm working on it.

Tom

-----Original Message-----
From: Otavio Salvador [mailto:otavio.salvador@ossystems.com.br] 
Sent: Tuesday, June 26, 2018 11:50 AM
To: Gary Bisson <gary.bisson@boundarydevices.com>; Tom Hochstein <tom.hochstein@nxp.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>; meta-freescale Mailing List <meta-freescale@yoctoproject.org>
Subject: Re: [meta-freescale] [PATCH 27/32] imx-gpu-viv: Add i.MX 8 support

Hello,

On Tue, Jun 26, 2018 at 5:12 AM, Gary Bisson <gary.bisson@boundarydevices.com> wrote:
> Hi Otavio, Tom,
>
> On Mon, Jun 25, 2018 at 04:30:27PM -0300, Otavio Salvador wrote:
>> From: Tom Hochstein <tom.hochstein@nxp.com>
>>
>> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>
>>  .../imx-gpu-viv/imx-gpu-viv-6.inc             | 37 ++++++++++++++++---
>>  .../imx-gpu-viv_6.2.4.p1.2-aarch64.bb         |  6 +++
>>  2 files changed, 37 insertions(+), 6 deletions(-)  create mode 
>> 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p1.2-aarch64.bb
>>
>> diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc 
>> b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
>> index 6cc8cbb1..d5023bdf 100644
>> --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
>> +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
>> @@ -12,11 +12,11 @@ DEPENDS += " \
>>         bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
>>                                                         '', d), d)} \  
>> "
>> -DEPENDS += "libdrm"
>>  DEPENDS += " \
>>      ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
>>                                                         '', d)} \  "
>> +DEPENDS_append_mx8 = " libdrm wayland"
>>
>>  # imx-gpu-viv does not provide everything it needs to for 
>> virtual/libgl  # on x11 backend or on Wayland backend with XWayland support.
>> @@ -29,6 +29,8 @@ EXTRA_PROVIDES_append_imxgpu3d = " \
>>      virtual/libgles1 \
>>      virtual/libgles2 \
>>  "
>> +EXTRA_PROVIDES_append_mx8 = " \
>> +    virtual/libopenvx \
>
> Isn't OpenVx only available on i.MX8QM? Same I think it'd be better 
> not to expose openvx for imx8mq since it's not supported.
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww
> .nxp.com%2Fproducts%2Fprocessors-and-microcontrollers%2Fapplications-p
> rocessors%2Fi.mx-applications-processors%2Fi.mx-8-processors%3AIMX8-SE
> RIES&data=02%7C01%7Ctom.hochstein%40nxp.com%7Cc51bc7955e3d489ee1e408d5
> db84dafb%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6366562860254918
> 12&sdata=Qcx0y%2FoTW3nEg0oqywfLwhE9iKPd7MqjpGPfAMrMseA%3D&reserved=0
>
> Also, it seems the i.MX8M Mini only supports OpenGL ES 2.0, not 3.1 
> and that Vulkan isn't supported either.
>
> I know it complexifies the recipe but it still should matches what the 
> HW is capable of, otherwise users will be lost.
>
> To be honest I'd leave i.MX8M Mini out of the picture for now since 
> only the i.MX8MQ is publicly available.

Agreed. Could you guys prepare a patch on top of this to merge?

I am intending to finish the upgrade of SDK and leave imx8 for a second step so we can work in a smaller patchset.

-- 
Otavio Salvador                             O.S. Systems
https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.ossystems.com.br&data=02%7C01%7Ctom.hochstein%40nxp.com%7Cc51bc7955e3d489ee1e408d5db84dafb%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636656286025491812&sdata=vihvMQD5HgsRMFh%2BxHoNa1kF1yCLHSh9pbbcmx%2FqBlU%3D&reserved=0        https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fcode.ossystems.com.br&data=02%7C01%7Ctom.hochstein%40nxp.com%7Cc51bc7955e3d489ee1e408d5db84dafb%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636656286025491812&sdata=Awvsh11RXVt903NsRdBVYeq2Cr213BWbhtzZvRaGrTY%3D&reserved=0
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

[PATCH 28/32] xf86-video-imx-vivante: Add i.MX 8 support

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
index fa3a1a35..0bc0bab1 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
@@ -51,6 +51,8 @@ RDEPENDS_${PN} += "libvivante-dri-imx \
                    xserver-xorg-extension-dri \
                    xserver-xorg-extension-dri2 \
                    xserver-xorg-extension-glx"
+RDEPENDS_${PN}_remove_mx8mq = "xserver-xorg-extension-glx"
+RDEPENDS_${PN}_append_mx8 = " kernel-module-vivante"
 
 REALSOLIBS := "${SOLIBS}"
 SOLIBS = "${SOLIBSDEV}"
@@ -62,4 +64,4 @@ FILES_${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIB
 FILES_xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi"
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx6|mx7ulp)"
+COMPATIBLE_MACHINE = "(mx6|mx7ulp|mx8)"
-- 
2.18.0

[PATCH 29/32] imx-base.inc: Add i.MX 8M support

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 419ab1bc..346d1c77 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -30,9 +30,10 @@ UBOOT_ENTRYPOINT_mx7 = "0x80008000"
 UBOOT_ENTRYPOINT_vf = "0x80008000"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER_DRIVER = "xf86-video-fbdev"
-XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante"
-XSERVER_DRIVER_vf = "xf86-video-modesetting"
+XSERVER_DRIVER                  = "xf86-video-fbdev"
+XSERVER_DRIVER_imxgpu2d         = "xf86-video-imx-vivante"
+XSERVER_DRIVER_vf               = "xf86-video-modesetting"
+XSERVER_DRIVER_append_mx8       = " xf86-video-modesetting"
 XSERVER_DRIVER_use-mainline-bsp = "xf86-video-armada"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
@@ -52,6 +53,7 @@ DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
 DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon"
 DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon"
 DEFAULTTUNE_mx7 ?= "cortexa7thf-neon"
+DEFAULTTUNE_mx8 ?= "aarch64"
 DEFAULTTUNE_vf ?= "cortexa5thf-neon"
 
 INHERIT += "machine-overrides-extender"
@@ -66,6 +68,8 @@ MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
 MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxgpu3d"
 
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
     mx6 \
@@ -97,6 +101,8 @@ MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60"
 MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
 MACHINE_SOCARCH_SUFFIX_mx6ul  = "-mx6ul"
 MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
+MACHINE_SOCARCH_SUFFIX_mx8mm  = "-mx8mm"
+MACHINE_SOCARCH_SUFFIX_mx8mq  = "-mx8m"
 MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
@@ -158,6 +164,7 @@ MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
 MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
+MACHINE_FIRMWARE_append_mx8  = " linux-firmware-ath10k"
 MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 # FIXME: Needs addition of firmware-imx of official BSPs
-- 
2.18.0

Re: [PATCH 29/32] imx-base.inc: Add i.MX 8M support

[Gary Bisson]

Hi Otavio, Tom,

Glad to see this series reaching the mailing list.

I have a few comments. First the title only mentions i.MX8M whereas the
patch seems to also add i.MX8M Mini support, it'd be clearer to state
both in the title.

On Mon, Jun 25, 2018 at 04:30:29PM -0300, Otavio Salvador wrote:
> From: Tom Hochstein <tom.hochstein@nxp.com>
> 
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>  conf/machine/include/imx-base.inc | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
> index 419ab1bc..346d1c77 100644
> --- a/conf/machine/include/imx-base.inc
> +++ b/conf/machine/include/imx-base.inc
> @@ -30,9 +30,10 @@ UBOOT_ENTRYPOINT_mx7 = "0x80008000"
>  UBOOT_ENTRYPOINT_vf = "0x80008000"
>  
>  PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
> -XSERVER_DRIVER = "xf86-video-fbdev"
> -XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante"
> -XSERVER_DRIVER_vf = "xf86-video-modesetting"
> +XSERVER_DRIVER                  = "xf86-video-fbdev"
> +XSERVER_DRIVER_imxgpu2d         = "xf86-video-imx-vivante"
> +XSERVER_DRIVER_vf               = "xf86-video-modesetting"
> +XSERVER_DRIVER_append_mx8       = " xf86-video-modesetting"
>  XSERVER_DRIVER_use-mainline-bsp = "xf86-video-armada"
>  XSERVER = "xserver-xorg \
>             xf86-input-evdev \
> @@ -52,6 +53,7 @@ DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
>  DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon"
>  DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon"
>  DEFAULTTUNE_mx7 ?= "cortexa7thf-neon"
> +DEFAULTTUNE_mx8 ?= "aarch64"
>  DEFAULTTUNE_vf ?= "cortexa5thf-neon"
>  
>  INHERIT += "machine-overrides-extender"
> @@ -66,6 +68,8 @@ MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
>  MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
>  MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
>  MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
> +MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
> +MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxgpu3d"
>  
>  MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
>      mx6 \
> @@ -97,6 +101,8 @@ MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60"
>  MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
>  MACHINE_SOCARCH_SUFFIX_mx6ul  = "-mx6ul"
>  MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
> +MACHINE_SOCARCH_SUFFIX_mx8mm  = "-mx8mm"
> +MACHINE_SOCARCH_SUFFIX_mx8mq  = "-mx8m"
>  MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
>  
>  MACHINE_ARCH_FILTER = "virtual/kernel"
> @@ -158,6 +164,7 @@ MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc"
>  MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
>  MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
>  MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
> +MACHINE_FIRMWARE_append_mx8  = " linux-firmware-ath10k"

Shouldn't this be board specific? Yes the EVK requires ath10k driver but
it's not a CPU requirement.

Regards,
Gary

Re: [PATCH 29/32] imx-base.inc: Add i.MX 8M support

[Otavio Salvador]

On Mon, Jun 25, 2018 at 5:22 PM, Gary Bisson
<gary.bisson@boundarydevices.com> wrote:
> Hi Otavio, Tom,
>
> Glad to see this series reaching the mailing list.
>
> I have a few comments. First the title only mentions i.MX8M whereas the
> patch seems to also add i.MX8M Mini support, it'd be clearer to state
> both in the title.

Agreed. Changed locale.

> On Mon, Jun 25, 2018 at 04:30:29PM -0300, Otavio Salvador wrote:
>> From: Tom Hochstein <tom.hochstein@nxp.com>
>>
>> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>
>>  conf/machine/include/imx-base.inc | 13 ++++++++++---
>>  1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
>> index 419ab1bc..346d1c77 100644
>> --- a/conf/machine/include/imx-base.inc
>> +++ b/conf/machine/include/imx-base.inc
>> @@ -30,9 +30,10 @@ UBOOT_ENTRYPOINT_mx7 = "0x80008000"
>>  UBOOT_ENTRYPOINT_vf = "0x80008000"
>>
>>  PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
>> -XSERVER_DRIVER = "xf86-video-fbdev"
>> -XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante"
>> -XSERVER_DRIVER_vf = "xf86-video-modesetting"
>> +XSERVER_DRIVER                  = "xf86-video-fbdev"
>> +XSERVER_DRIVER_imxgpu2d         = "xf86-video-imx-vivante"
>> +XSERVER_DRIVER_vf               = "xf86-video-modesetting"
>> +XSERVER_DRIVER_append_mx8       = " xf86-video-modesetting"
>>  XSERVER_DRIVER_use-mainline-bsp = "xf86-video-armada"
>>  XSERVER = "xserver-xorg \
>>             xf86-input-evdev \
>> @@ -52,6 +53,7 @@ DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
>>  DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon"
>>  DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon"
>>  DEFAULTTUNE_mx7 ?= "cortexa7thf-neon"
>> +DEFAULTTUNE_mx8 ?= "aarch64"
>>  DEFAULTTUNE_vf ?= "cortexa5thf-neon"
>>
>>  INHERIT += "machine-overrides-extender"
>> @@ -66,6 +68,8 @@ MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
>>  MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
>>  MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
>>  MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
>> +MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
>> +MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxgpu3d"
>>
>>  MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
>>      mx6 \
>> @@ -97,6 +101,8 @@ MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60"
>>  MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
>>  MACHINE_SOCARCH_SUFFIX_mx6ul  = "-mx6ul"
>>  MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
>> +MACHINE_SOCARCH_SUFFIX_mx8mm  = "-mx8mm"
>> +MACHINE_SOCARCH_SUFFIX_mx8mq  = "-mx8m"
>>  MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
>>
>>  MACHINE_ARCH_FILTER = "virtual/kernel"
>> @@ -158,6 +164,7 @@ MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc"
>>  MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
>>  MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
>>  MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
>> +MACHINE_FIRMWARE_append_mx8  = " linux-firmware-ath10k"
>
> Shouldn't this be board specific? Yes the EVK requires ath10k driver but
> it's not a CPU requirement.

Yes. This should be added in the board.

Dropped locally.

I pushed the updated patches in master-next.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

[PATCH 30/32] imx-base.inc: Add imxdpu and imxdpublit to MACHINEOVERRIDES_EXTENDER

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

- imx-gpu-g2d requires DPU-blit support
- imx-dpu-g2d requires DPU support

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc                  | 14 +++++++-------
 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb  |  4 +++-
 .../imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb          |  4 +++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 346d1c77..6ba5014d 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
 INHERIT += "machine-overrides-extender"
 
 MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
-MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxdpublit:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
 MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxdpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxdpu:imxgpu3d"
 
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
     mx6 \
diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
index 76cb5f9b..9a89fa66 100644
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
@@ -34,4 +34,6 @@ INSANE_SKIP_${PN} += "ldflags"
 FILES_${PN} = "${libdir}/libg2d* /opt"
 FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
 
-COMPATIBLE_MACHINE = "(mx8)"
+# Compatible only with i.MX DPU
+COMPATIBLE_MACHINE = "(^$)"
+COMPATIBLE_MACHINE_imxdpu = "${MACHINE}"
diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
index eab1d31b..a4dbe4e3 100644
--- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
+++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
@@ -35,4 +35,6 @@ FILES_${PN} = "${libdir}/libg2d* /opt"
 FILES_${PN}-dev = "${includedir}"
 INSANE_SKIP_${PN} = "ldflags"
 
-COMPATIBLE_MACHINE = "(mx6|mx7ulp)"
+# Compatible only with i.MX DPU-blit
+COMPATIBLE_MACHINE = "(^$)"
+COMPATIBLE_MACHINE_imxdpublit = "${MACHINE}"
-- 
2.18.0

Re: [PATCH 30/32] imx-base.inc: Add imxdpu and imxdpublit to MACHINEOVERRIDES_EXTENDER

[Gary Bisson]

Hi Otavio, Tom,

On Mon, Jun 25, 2018 at 04:30:30PM -0300, Otavio Salvador wrote:
> From: Tom Hochstein <tom.hochstein@nxp.com>
> 
> - imx-gpu-g2d requires DPU-blit support

Can you elaborate on that? What has changed in the g2d package so that
it now depends on DPU-blit?

> - imx-dpu-g2d requires DPU support
> 
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>  conf/machine/include/imx-base.inc                  | 14 +++++++-------
>  recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb  |  4 +++-
>  .../imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb          |  4 +++-
>  3 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
> index 346d1c77..6ba5014d 100644
> --- a/conf/machine/include/imx-base.inc
> +++ b/conf/machine/include/imx-base.inc
> @@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
>  INHERIT += "machine-overrides-extender"
>  
>  MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
> -MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxgpu3d"
> -MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
> -MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxgpu3d"
> -MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxepdc"
> +MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d"
> +MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
> +MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> +MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxdpublit:imxepdc"

?? I don't understand that naming at all. Shouldn't imxdpublit be
necessary on HW that has a DPU (ie none of the above)?

>  MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
>  MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
>  MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
>  MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
> -MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
> -MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
> -MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxgpu3d"
> +MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> +MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxdpu:imxgpu3d"

This is wrong, mx8mq doesn't have a DPU.

Regards,
Gary

Re: [PATCH 30/32] imx-base.inc: Add imxdpu and imxdpublit to MACHINEOVERRIDES_EXTENDER

[Tom Hochstein]

After thinking on this some more, let me start over.

> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Gary Bisson
> Sent: Tuesday, June 26, 2018 3:20 AM
> To: Otavio Salvador <otavio@ossystems.com.br>
> Cc: meta-freescale Mailing List <meta-freescale@yoctoproject.org>
> Subject: Re: [meta-freescale] [PATCH 30/32] imx-base.inc: Add imxdpu and
> imxdpublit to MACHINEOVERRIDES_EXTENDER
> 
> Hi Otavio, Tom,
> 
> On Mon, Jun 25, 2018 at 04:30:30PM -0300, Otavio Salvador wrote:
> > From: Tom Hochstein <tom.hochstein@nxp.com>
> >
> > - imx-gpu-g2d requires DPU-blit support
> 
> Can you elaborate on that? What has changed in the g2d package so that it
> now depends on DPU-blit?

Nothing has changed, this just makes an existing requirement explicit. i.MX 6 and 7 with 2D GPU do in fact have a separate DPU blitting engine, different from the DPU used for i.MX 8.

> 
> > - imx-dpu-g2d requires DPU support
> >
> > Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> >
> >  conf/machine/include/imx-base.inc                  | 14 +++++++-------
> >  recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb  |  4 +++-
> >  .../imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb          |  4 +++-
> >  3 files changed, 13 insertions(+), 9 deletions(-)
> >
> > diff --git a/conf/machine/include/imx-base.inc
> > b/conf/machine/include/imx-base.inc
> > index 346d1c77..6ba5014d 100644
> > --- a/conf/machine/include/imx-base.inc
> > +++ b/conf/machine/include/imx-base.inc
> > @@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
> >  INHERIT += "machine-overrides-extender"
> >
> >  MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
> > -MACHINEOVERRIDES_EXTENDER_mx6q   =
> "imxipu:imxvpu:imxgpu2d:imxgpu3d"
> > -MACHINEOVERRIDES_EXTENDER_mx6dl  =
> "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
> > -MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxgpu3d"
> > -MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxepdc"
> > +MACHINEOVERRIDES_EXTENDER_mx6q   =
> "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d"
> > +MACHINEOVERRIDES_EXTENDER_mx6dl  =
> "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
> > +MACHINEOVERRIDES_EXTENDER_mx6sx  =
> "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> > +MACHINEOVERRIDES_EXTENDER_mx6sl  =
> "imxpxp:imxgpu2d:imxdpublit:imxepdc"
> 
> ?? I don't understand that naming at all. Shouldn't imxdpublit be necessary
> on HW that has a DPU (ie none of the above)?
> 
> >  MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
> >  MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
> >  MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
> >  MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
> > -MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
> > -MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
> > -MACHINEOVERRIDES_EXTENDER_mx8mm  =
> "imxvpu:imxgpu2d:imxgpu3d"
> > +MACHINEOVERRIDES_EXTENDER_mx7ulp =
> "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> > +MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxdpu:imxgpu3d"
> 
> This is wrong, mx8mq doesn't have a DPU.

You are correct about that, my mistake.

So at this point just need to fix this patch. Note, that I need to submit an update for imx-gpu-sdk that also depends on imxdpublit.

Tom

Re: [PATCH 30/32] imx-base.inc: Add imxdpu and imxdpublit to MACHINEOVERRIDES_EXTENDER

[Gary Bisson]

Hi Tom,

On Wed, Jun 27, 2018 at 02:00:29PM +0000, Tom Hochstein wrote:
> After thinking on this some more, let me start over.
> 
> > -----Original Message-----
> > From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> > bounces@yoctoproject.org] On Behalf Of Gary Bisson
> > Sent: Tuesday, June 26, 2018 3:20 AM
> > To: Otavio Salvador <otavio@ossystems.com.br>
> > Cc: meta-freescale Mailing List <meta-freescale@yoctoproject.org>
> > Subject: Re: [meta-freescale] [PATCH 30/32] imx-base.inc: Add imxdpu and
> > imxdpublit to MACHINEOVERRIDES_EXTENDER
> > 
> > Hi Otavio, Tom,
> > 
> > On Mon, Jun 25, 2018 at 04:30:30PM -0300, Otavio Salvador wrote:
> > > From: Tom Hochstein <tom.hochstein@nxp.com>
> > >
> > > - imx-gpu-g2d requires DPU-blit support
> > 
> > Can you elaborate on that? What has changed in the g2d package so that it
> > now depends on DPU-blit?
> 
> Nothing has changed, this just makes an existing requirement explicit. i.MX 6 and 7 with 2D GPU do in fact have a separate DPU blitting engine, different from the DPU used for i.MX 8.

What does "DPU" mean to you? I think what you mean is "i.MX6 and 7 can
do 2D blit operations with their 2D GPU".

Using the term DPU doesn't make sense to me, please elaborate.

My definition of DPU is "Display Processing Unit" as defined in i.MX8QM
docs, therefore using the same term for CPU that don't have that IP is
confusing, isn't it?

> > > - imx-dpu-g2d requires DPU support
> > >
> > > Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > > ---
> > >
> > >  conf/machine/include/imx-base.inc                  | 14 +++++++-------
> > >  recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb  |  4 +++-
> > >  .../imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb          |  4 +++-
> > >  3 files changed, 13 insertions(+), 9 deletions(-)
> > >
> > > diff --git a/conf/machine/include/imx-base.inc
> > > b/conf/machine/include/imx-base.inc
> > > index 346d1c77..6ba5014d 100644
> > > --- a/conf/machine/include/imx-base.inc
> > > +++ b/conf/machine/include/imx-base.inc
> > > @@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
> > >  INHERIT += "machine-overrides-extender"
> > >
> > >  MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
> > > -MACHINEOVERRIDES_EXTENDER_mx6q   =
> > "imxipu:imxvpu:imxgpu2d:imxgpu3d"
> > > -MACHINEOVERRIDES_EXTENDER_mx6dl  =
> > "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
> > > -MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxgpu3d"
> > > -MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxepdc"
> > > +MACHINEOVERRIDES_EXTENDER_mx6q   =
> > "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d"
> > > +MACHINEOVERRIDES_EXTENDER_mx6dl  =
> > "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
> > > +MACHINEOVERRIDES_EXTENDER_mx6sx  =
> > "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> > > +MACHINEOVERRIDES_EXTENDER_mx6sl  =
> > "imxpxp:imxgpu2d:imxdpublit:imxepdc"
> > 
> > ?? I don't understand that naming at all. Shouldn't imxdpublit be necessary
> > on HW that has a DPU (ie none of the above)?
> > 
> > >  MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
> > >  MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
> > >  MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
> > >  MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
> > > -MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
> > > -MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
> > > -MACHINEOVERRIDES_EXTENDER_mx8mm  =
> > "imxvpu:imxgpu2d:imxgpu3d"
> > > +MACHINEOVERRIDES_EXTENDER_mx7ulp =
> > "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> > > +MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxdpu:imxgpu3d"
> > 
> > This is wrong, mx8mq doesn't have a DPU.
> 
> You are correct about that, my mistake.
> 
> So at this point just need to fix this patch. Note, that I need to submit an update for imx-gpu-sdk that also depends on imxdpublit.

Sorry but that still doesn't tell me why we're not using imxgpu2d as
before? Why creating a "2dblit" feature, it was known in the first place
that imxgpu2d is capable of 2dblit. Actually let's generalize it and say
that "libg2d" (whether it is gpu or dpu) is capable of blitting.

The only issue I see is that in the case of imx8mm, both gpu-g2d and
dpu-g2d can be built, but that should be easily selectable via a
preferred provider for lig2d no? Also I find it more flexible to leave
it to the user to select which 2D blitting engine he wants to use
instead of forcing one over the other.

Regards,
Gary

Re: [PATCH 30/32] imx-base.inc: Add imxdpu and imxdpublit to MACHINEOVERRIDES_EXTENDER

[Tom Hochstein]

Hi Gary,

I think what you say makes a lot of sense. There's little value to these overrides, so I'll remove them from the patchset.

Tom

> -----Original Message-----
> From: Gary Bisson [mailto:gary.bisson@boundarydevices.com]
> Sent: Wednesday, June 27, 2018 9:13 AM
> To: Tom Hochstein <tom.hochstein@nxp.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>; meta-freescale Mailing List
> <meta-freescale@yoctoproject.org>
> Subject: Re: [meta-freescale] [PATCH 30/32] imx-base.inc: Add imxdpu and
> imxdpublit to MACHINEOVERRIDES_EXTENDER
> 
> Hi Tom,
> 
> On Wed, Jun 27, 2018 at 02:00:29PM +0000, Tom Hochstein wrote:
> > After thinking on this some more, let me start over.
> >
> > > -----Original Message-----
> > > From: meta-freescale-bounces@yoctoproject.org
> > > [mailto:meta-freescale- bounces@yoctoproject.org] On Behalf Of Gary
> > > Bisson
> > > Sent: Tuesday, June 26, 2018 3:20 AM
> > > To: Otavio Salvador <otavio@ossystems.com.br>
> > > Cc: meta-freescale Mailing List <meta-freescale@yoctoproject.org>
> > > Subject: Re: [meta-freescale] [PATCH 30/32] imx-base.inc: Add imxdpu
> > > and imxdpublit to MACHINEOVERRIDES_EXTENDER
> > >
> > > Hi Otavio, Tom,
> > >
> > > On Mon, Jun 25, 2018 at 04:30:30PM -0300, Otavio Salvador wrote:
> > > > From: Tom Hochstein <tom.hochstein@nxp.com>
> > > >
> > > > - imx-gpu-g2d requires DPU-blit support
> > >
> > > Can you elaborate on that? What has changed in the g2d package so
> > > that it now depends on DPU-blit?
> >
> > Nothing has changed, this just makes an existing requirement explicit. i.MX
> 6 and 7 with 2D GPU do in fact have a separate DPU blitting engine, different
> from the DPU used for i.MX 8.
> 
> What does "DPU" mean to you? I think what you mean is "i.MX6 and 7 can do
> 2D blit operations with their 2D GPU".
> 
> Using the term DPU doesn't make sense to me, please elaborate.
> 
> My definition of DPU is "Display Processing Unit" as defined in i.MX8QM
> docs, therefore using the same term for CPU that don't have that IP is
> confusing, isn't it?
> 
> > > > - imx-dpu-g2d requires DPU support
> > > >
> > > > Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> > > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > > > ---
> > > >
> > > >  conf/machine/include/imx-base.inc                  | 14 +++++++-------
> > > >  recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb  |  4 +++-
> > > >  .../imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb          |  4 +++-
> > > >  3 files changed, 13 insertions(+), 9 deletions(-)
> > > >
> > > > diff --git a/conf/machine/include/imx-base.inc
> > > > b/conf/machine/include/imx-base.inc
> > > > index 346d1c77..6ba5014d 100644
> > > > --- a/conf/machine/include/imx-base.inc
> > > > +++ b/conf/machine/include/imx-base.inc
> > > > @@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
> > > >  INHERIT += "machine-overrides-extender"
> > > >
> > > >  MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
> > > > -MACHINEOVERRIDES_EXTENDER_mx6q   =
> > > "imxipu:imxvpu:imxgpu2d:imxgpu3d"
> > > > -MACHINEOVERRIDES_EXTENDER_mx6dl  =
> > > "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
> > > > -MACHINEOVERRIDES_EXTENDER_mx6sx  =
> "imxpxp:imxgpu2d:imxgpu3d"
> > > > -MACHINEOVERRIDES_EXTENDER_mx6sl  =
> "imxpxp:imxgpu2d:imxepdc"
> > > > +MACHINEOVERRIDES_EXTENDER_mx6q   =
> > > "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d"
> > > > +MACHINEOVERRIDES_EXTENDER_mx6dl  =
> > > "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
> > > > +MACHINEOVERRIDES_EXTENDER_mx6sx  =
> > > "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> > > > +MACHINEOVERRIDES_EXTENDER_mx6sl  =
> > > "imxpxp:imxgpu2d:imxdpublit:imxepdc"
> > >
> > > ?? I don't understand that naming at all. Shouldn't imxdpublit be
> > > necessary on HW that has a DPU (ie none of the above)?
> > >
> > > >  MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
> > > >  MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
> > > >  MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
> > > >  MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
> > > > -MACHINEOVERRIDES_EXTENDER_mx7ulp =
> "imxpxp:imxgpu2d:imxgpu3d"
> > > > -MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
> > > > -MACHINEOVERRIDES_EXTENDER_mx8mm  =
> > > "imxvpu:imxgpu2d:imxgpu3d"
> > > > +MACHINEOVERRIDES_EXTENDER_mx7ulp =
> > > "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
> > > > +MACHINEOVERRIDES_EXTENDER_mx8mq  =
> "imxvpu:imxdpu:imxgpu3d"
> > >
> > > This is wrong, mx8mq doesn't have a DPU.
> >
> > You are correct about that, my mistake.
> >
> > So at this point just need to fix this patch. Note, that I need to submit an
> update for imx-gpu-sdk that also depends on imxdpublit.
> 
> Sorry but that still doesn't tell me why we're not using imxgpu2d as before?
> Why creating a "2dblit" feature, it was known in the first place that imxgpu2d
> is capable of 2dblit. Actually let's generalize it and say that "libg2d" (whether
> it is gpu or dpu) is capable of blitting.
> 
> The only issue I see is that in the case of imx8mm, both gpu-g2d and dpu-g2d
> can be built, but that should be easily selectable via a preferred provider for
> lig2d no? Also I find it more flexible to leave it to the user to select which 2D
> blitting engine he wants to use instead of forcing one over the other.
> 
> Regards,
> Gary

[PATCH 31/32] imx-base.inc: Add imxgpu to MACHINEOVERRIDES_EXTENDER

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Add imxgpu to simplify the conditional for imxgpu2d OR
imxgpu3d. Note that i.MX 8MQ has no 2D, so the previous
idiom of using imxgpu2d to mean any GPU is no longer correct.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 32 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 6ba5014d..56c2817a 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
 INHERIT += "machine-overrides-extender"
 
 MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
-MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxdpublit:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
 MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxdpu:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxdpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu:imxdpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu:imxgpu2d:imxdpu:imxgpu3d"
 
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
     mx6 \
@@ -116,13 +116,10 @@ MACHINE_SOCARCH_FILTER_append_imxvpu = " \
     imx-vpuwrap \
     libimxvpuapi \
 "
-MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
+MACHINE_SOCARCH_FILTER_append_imxgpu = " \
     virtual/egl \
     virtual/mesa \
     virtual/libg2d \
-    virtual/libgl \
-    virtual/libgles1 \
-    virtual/libgles2 \
     virtual/libopenvg \
     cairo \
     gstreamer1.0-plugins-bad \
@@ -130,6 +127,11 @@ MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
     pango \
     weston \
 "
+MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \
+    virtual/libgl \
+    virtual/libgles1 \
+    virtual/libgles2 \
+"
 MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
     virtual/egl \
     virtual/libopenvg \
@@ -198,12 +200,8 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx6ull ?= "gstreamer1.0-plugins-imx-meta"
 MACHINE_GSTREAMER_1_0_PLUGIN_mx7d ?= "gstreamer1.0-plugins-imx-meta"
 
 # Determines if the SoC has support for Vivante kernel driver
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT       = "0"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6q  = "1"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sx = "1"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sl = "1"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx7ulp = "1"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT        = "0"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1"
 
 # Handle Vivante kernel driver setting:
 #   0 - machine does not have Vivante GPU driver support
-- 
2.18.0

[PATCH 32/32] weston: Set package arch for all i.MX

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein@nxp.com>

Weston is built from a fork for all i.MX, not just
those with GPU, so set the package arch accordingly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 conf/machine/include/imx-base.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 56c2817a..2273db59 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -108,6 +108,7 @@ MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
 MACHINE_ARCH_FILTER = "virtual/kernel"
 MACHINE_SOCARCH_FILTER_append_imx = " \
     alsa-lib \
+    weston \
 "
 MACHINE_SOCARCH_FILTER_append_imxvpu = " \
     imx-codec \
@@ -125,7 +126,6 @@ MACHINE_SOCARCH_FILTER_append_imxgpu = " \
     gstreamer1.0-plugins-bad \
     libgal-imx \
     pango \
-    weston \
 "
 MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \
     virtual/libgl \
-- 
2.18.0