[meta-freescale] [PATCH 00/14] Upstream kernel/uboot/Multimedia for L4.9.123-2.3.0_8mm

[Yuqing Zhu]

Add support for i.MX 8MM EVK
Hold linux-libc-headers v4.9 recipe in meta-freescale layer
Upgrade linux-imx to v4.9.123
Upgrade imx-vpu-hantro to 1.8.0
Upgrade imx-codec/parser/vpuwrap to 4.4.2
Update GST to L4.9.123-2.3.0_8mm_ga release

Yuqing Zhu (14):
linux-libc-headers: Use linux-libc-headers v4.9 for
L4.9.123-2.3.0_8mm_ga
linux-imx: Upgrade to v4.9.123 for L4.9.123-2.3.0_8mm_ga
linux-imx-mfgtool: Upgrade to v4.9.123 for L4.9.123-2.3.0_8mm_ga
u-boot-imx: Update to L4.9.123-2.3.0_8mm_ga release
imx8mmevk.conf/imx-base.inc: Add i.MX 8MM EVK support
imx-vpu-hantro: Upgrade version from 1.7.0 to 1.8.0
imx-vpuwrap: Upgrade version form 4.4.0 to 4.4.2
imx-parser: Upgrade version from 4.4.0 to 4.4.2
imx-codec: Upgrade version from 4.4.0 to 4.4.2
gstreamer1.0: Update to L4.9.123-2.3.0_8mm_ga
gstreamer1.0-plugins-base: Update to L4.9.123-2.3.0_8mm_ga release
gstreamer1.0-plugins-good: Update to L4.9.123-2.3.0_8mm_ga release
gstreamer1.0-plugins-bad: Update to L4.9.123-2.3.0_8mm_ga release
imx-gst1.0-plugin: Upgrade version from 4.4.0 to 4.4.2

conf/machine/imx8mmevk.conf | 58 ++++++++++++++
conf/machine/include/imx-base.inc | 3 +
...Fix-ion.h-header-inclusion-to-be-standard.patch | 85 +++++++++++++-------
...vpu-hantro_1.7.0.bb => imx-vpu-hantro_1.8.0.bb} | 10 ++-
recipes-bsp/u-boot/u-boot-imx_2017.03.bb | 4 +-
.../files/Install-dma-buf-h.patch | 12 +++
.../linux-libc-headers/linux-libc-headers.inc | 91 ++++++++++++++++++++++
.../linux-libc-headers/linux-libc-headers_4.9.bb | 11 +++
.../imx/defconfig | 0
.../mx8/defconfig | 16 +++-
.../defconfig | 0
...tool_4.9.88.bb => linux-imx-mfgtool_4.9.123.bb} | 0
.../{linux-imx_4.9.88.bb => linux-imx_4.9.123.bb} | 4 +-
.../gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb | 4 +-
...0-plugins-base-Fix-ion.h-header-inclusion.patch | 45 +++++++++++
.../gstreamer1.0-plugins-base_1.14.imx.bb | 10 ++-
.../gstreamer1.0-plugins-good_1.14.imx.bb | 4 +-
.../gstreamer/gstreamer1.0_1.14.imx.bb | 2 +-
...plugin-Fix-ion.h-header-inclusion-to-be-s.patch | 44 +++++++++++
...-plugin_4.4.0.bb => imx-gst1.0-plugin_4.4.2.bb} | 10 ++-
.../{imx-codec_4.4.0.bb => imx-codec_4.4.2.bb} | 6 +-
.../{imx-parser_4.4.0.bb => imx-parser_4.4.2.bb} | 6 +-
.../{imx-vpuwrap_4.4.0.bb => imx-vpuwrap_4.4.2.bb} | 8 +-
23 files changed, 377 insertions(+), 56 deletions(-)
create mode 100644 conf/machine/imx8mmevk.conf
rename recipes-bsp/imx-vpu-hantro/{imx-vpu-hantro_1.7.0.bb => imx-vpu-hantro_1.8.0.bb} (66%)
create mode 100644 recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
create mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers.inc
create mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
rename recipes-kernel/linux/{linux-imx-4.9.88 => linux-imx-4.9.123}/imx/defconfig (100%)
rename recipes-kernel/linux/{linux-imx-4.9.88 => linux-imx-4.9.123}/mx8/defconfig (97%)
rename recipes-kernel/linux/{linux-imx-mfgtool-4.9.88 => linux-imx-mfgtool-4.9.123}/defconfig (100%)
rename recipes-kernel/linux/{linux-imx-mfgtool_4.9.88.bb => linux-imx-mfgtool_4.9.123.bb} (100%)
rename recipes-kernel/linux/{linux-imx_4.9.88.bb => linux-imx_4.9.123.bb} (86%)
create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch
create mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch
rename recipes-multimedia/gstreamer/{imx-gst1.0-plugin_4.4.0.bb => imx-gst1.0-plugin_4.4.2.bb} (91%)
rename recipes-multimedia/imx-codec/{imx-codec_4.4.0.bb => imx-codec_4.4.2.bb} (95%)
rename recipes-multimedia/imx-parser/{imx-parser_4.4.0.bb => imx-parser_4.4.2.bb} (88%)
rename recipes-multimedia/imx-vpuwrap/{imx-vpuwrap_4.4.0.bb => imx-vpuwrap_4.4.2.bb} (73%)

[Yuqing Zhu]

Hold linux-libc-headers v4.9 in meta-freescale layer,
which matches the current linux-imx version in L4.9.123-2.3.0_8mm_ga.

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
.../files/Install-dma-buf-h.patch | 12 +++
.../linux-libc-headers/linux-libc-headers.inc | 91 ++++++++++++++++++++++
.../linux-libc-headers/linux-libc-headers_4.9.bb | 11 +++
3 files changed, 114 insertions(+)
create mode 100644 recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
create mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers.inc
create mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb

diff --git a/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch b/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
new file mode 100644
index 0000000..285ccc4
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
@@ -0,0 +1,12 @@
+Index: git/include/uapi/linux/Kbuild
+===================================================================
+--- git.orig/include/uapi/linux/Kbuild 2017-07-18 10:58:56.217022277 -0500
++++ git/include/uapi/linux/Kbuild 2017-07-18 16:04:47.096019372 -0500
+@@ -104,6 +104,7 @@
+ header-y += dlm.h
+ header-y += dlm_netlink.h
+ header-y += dlm_plock.h
++header-y += dma-buf.h
+ header-y += dm-ioctl.h
+ header-y += dm-log-userspace.h
+ header-y += dn.h
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
new file mode 100644
index 0000000..1657df6
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -0,0 +1,91 @@
+SUMMARY = "Sanitized set of kernel headers for the C library's use"
+SECTION = "devel"
+LICENSE = "GPLv2"
+
+#########################################################################
+#### PLEASE READ
+#########################################################################
+#
+# You're probably looking here thinking you need to create some new copy
+# of linux-libc-headers since you have your own custom kernel. To put
+# this simply, you DO NOT.
+#
+# Why? These headers are used to build the libc. If you customise the
+# headers you are customising the libc and the libc becomes machine
+# specific. Most people do not add custom libc extensions to the kernel
+# and have a machine specific libc.
+#
+# But you have some kernel headers you need for some driver? That is fine
+# but get them from STAGING_KERNEL_DIR where the kernel installs itself.
+# This will make the package using them machine specific but this is much
+# better than having a machine specific C library. This does mean your
+# recipe needs a
+# do_configure[depends] += "virtual/kernel:do_shared_workdir"
+# but again, that is fine and makes total sense.
+#
+# There can also be a case where your kernel extremely old and you want
+# an older libc ABI for that old kernel. The headers installed by this
+# recipe should still be a standard mainline kernel, not your own custom
+# one.
+#
+# -- RP
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+python __anonymous () {
+ major = d.getVar("PV").split('.')[0]
+ if major == "3":
+ d.setVar("HEADER_FETCH_VER", "3.0")
+ elif major == "4":
+ d.setVar("HEADER_FETCH_VER", "4.x")
+ else:
+ d.setVar("HEADER_FETCH_VER", "2.6")
+}
+
+inherit kernel-arch pkgconfig multilib_header
+
+KORG_ARCHIVE_COMPRESSION ?= "xz"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.${KORG_ARCHIVE_COMPRESSION}"
+UPSTREAM_CHECK_URI = "https://www.kernel.org/"
+
+S = "${WORKDIR}/linux-${PV}"
+
+EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}""
+
+do_configure() {
+ oe_runmake allnoconfig
+}
+
+do_compile () {
+}
+
+do_install() {
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
+ # Kernel should not be exporting this header
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+ # The ..install.cmd conflicts between various configure runs
+ find ${D}${includedir} -name ..install.cmd | xargs rm -f
+}
+
+do_install_append_aarch64 () {
+ do_install_armmultilib
+}
+
+do_install_append_arm () {
+ do_install_armmultilib
+}
+
+do_install_armmultilib () {
+ oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/mman.h asm/param.h asm/perf_regs.h
+ oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h
+}
+
+BBCLASSEXTEND = "nativesdk"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb b/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
new file mode 100644
index 0000000..d02c355
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
@@ -0,0 +1,11 @@
+require linux-libc-headers.inc
+
+SRC_URI_append_libc-musl = "\
+ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
+ file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \
+ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
+ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
+ "
+
+SRC_URI[md5sum] = "0a68ef3615c64bd5ee54a3320e46667d"
+SRC_URI[sha256sum] = "029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a"

[Max Krummenacher]

Hi

Why exactly is this needed?
Forking usually is not the solution, it is the beginning of the painfull
process of merging again...
So I have strong feelings against this change.

By changing linux-libc-headers you also change libc. So nearly everything
built becomes now machine specific.

Regards
Max

Note that Install-dma-buf-h.patch is not part of the SRC_URI and thus not
applied. Mainline fixed this with this commit:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?h=linux-4.14.y&id=2220fc1ab363e6fab1f321430d69be17a8b92bd7
Later they made the explicit list of uapi headers even unneeded:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=fcc8487d477a3452a1d0ccbdd4c5e0e1e3cb8bed

Post by Yuqing Zhu
Hold linux-libc-headers v4.9 in meta-freescale layer,
which matches the current linux-imx version in L4.9.123-2.3.0_8mm_ga.
---
.../files/Install-dma-buf-h.patch | 12 +++
.../linux-libc-headers/linux-libc-headers.inc | 91
++++++++++++++++++++++
.../linux-libc-headers/linux-libc-headers_4.9.bb | 11 +++
3 files changed, 114 insertions(+)
create mode 100644
recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
create mode 100644
recipes-kernel/linux-libc-headers/linux-libc-headers.inc
create mode 100644 recipes-kernel/linux-libc-headers/
linux-libc-headers_4.9.bb
diff --git
a/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
b/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
new file mode 100644
index 0000000..285ccc4
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
@@ -0,0 +1,12 @@
+Index: git/include/uapi/linux/Kbuild
+===================================================================
+--- git.orig/include/uapi/linux/Kbuild 2017-07-18 10:58:56.217022277 -0500
++++ git/include/uapi/linux/Kbuild 2017-07-18 16:04:47.096019372 -0500
+ header-y += dlm.h
+ header-y += dlm_netlink.h
+ header-y += dlm_plock.h
++header-y += dma-buf.h
+ header-y += dm-ioctl.h
+ header-y += dm-log-userspace.h
+ header-y += dn.h
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
new file mode 100644
index 0000000..1657df6
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -0,0 +1,91 @@
+SUMMARY = "Sanitized set of kernel headers for the C library's use"
+SECTION = "devel"
+LICENSE = "GPLv2"
+
+#########################################################################
+#### PLEASE READ
+#########################################################################
+#
+# You're probably looking here thinking you need to create some new copy
+# of linux-libc-headers since you have your own custom kernel. To put
+# this simply, you DO NOT.
+#
+# Why? These headers are used to build the libc. If you customise the
+# headers you are customising the libc and the libc becomes machine
+# specific. Most people do not add custom libc extensions to the kernel
+# and have a machine specific libc.
+#
+# But you have some kernel headers you need for some driver? That is fine
+# but get them from STAGING_KERNEL_DIR where the kernel installs itself.
+# This will make the package using them machine specific but this is much
+# better than having a machine specific C library. This does mean your
+# recipe needs a
+# do_configure[depends] += "virtual/kernel:do_shared_workdir"
+# but again, that is fine and makes total sense.
+#
+# There can also be a case where your kernel extremely old and you want
+# an older libc ABI for that old kernel. The headers installed by this
+# recipe should still be a standard mainline kernel, not your own custom
+# one.
+#
+# -- RP
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+python __anonymous () {
+ major = d.getVar("PV").split('.')[0]
+ d.setVar("HEADER_FETCH_VER", "3.0")
+ d.setVar("HEADER_FETCH_VER", "4.x")
+ d.setVar("HEADER_FETCH_VER", "2.6")
+}
+
+inherit kernel-arch pkgconfig multilib_header
+
+KORG_ARCHIVE_COMPRESSION ?= "xz"
+
+SRC_URI =
"${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.${KORG_ARCHIVE_COMPRESSION}"
+UPSTREAM_CHECK_URI = "https://www.kernel.org/"
+
+S = "${WORKDIR}/linux-${PV}"
+
+EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}""
+
+do_configure() {
+ oe_runmake allnoconfig
+}
+
+do_compile () {
+}
+
+do_install() {
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
+ # Kernel should not be exporting this header
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+ # The ..install.cmd conflicts between various configure runs
+ find ${D}${includedir} -name ..install.cmd | xargs rm -f
+}
+
+do_install_append_aarch64 () {
+ do_install_armmultilib
+}
+
+do_install_append_arm () {
+ do_install_armmultilib
+}
+
+do_install_armmultilib () {
+ oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h
asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/mman.h asm/param.h
asm/perf_regs.h
+ oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h
asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h
asm/swab.h asm/types.h asm/unistd.h
+}
+
+BBCLASSEXTEND = "nativesdk"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
b/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
new file mode 100644
index 0000000..d02c355
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
@@ -0,0 +1,11 @@
+require linux-libc-headers.inc
+
+SRC_URI_append_libc-musl = "\
+ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
+ file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \
+ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
+
file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
+ "
+
+SRC_URI[md5sum] = "0a68ef3615c64bd5ee54a3320e46667d"
+SRC_URI[sha256sum] =
"029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a"
--
1.9.1
--
_______________________________________________
meta-freescale mailing list
https://lists.yoctoproject.org/listinfo/meta-freescale

[Gary Bisson]

Hi,

+1, I agree with Max that this seems like a bad idea.

That is for this reason that we avoided to copy ion.h around, having the
packages that need it to look directly to its default location.

Can't we do the same for dma-buf.h?

Regards,

Gary Bisson
Boundary Devices, LLC
www.boundarydevices.com <http://www.BoundaryDevices.com>

Post by Max Krummenacher
Hi
Why exactly is this needed?
Forking usually is not the solution, it is the beginning of the painfull
process of merging again...
So I have strong feelings against this change.
By changing linux-libc-headers you also change libc. So nearly everything
built becomes now machine specific.
Regards
Max
Note that Install-dma-buf-h.patch is not part of the SRC_URI and thus not
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?h=linux-4.14.y&id=2220fc1ab363e6fab1f321430d69be17a8b92bd7
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=fcc8487d477a3452a1d0ccbdd4c5e0e1e3cb8bed

Post by Yuqing Zhu
Hold linux-libc-headers v4.9 in meta-freescale layer,
which matches the current linux-imx version in L4.9.123-2.3.0_8mm_ga.
---
.../files/Install-dma-buf-h.patch | 12 +++
.../linux-libc-headers/linux-libc-headers.inc | 91
++++++++++++++++++++++
.../linux-libc-headers/linux-libc-headers_4.9.bb | 11 +++
3 files changed, 114 insertions(+)
create mode 100644
recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
create mode 100644
recipes-kernel/linux-libc-headers/linux-libc-headers.inc
create mode 100644 recipes-kernel/linux-libc-headers/
linux-libc-headers_4.9.bb
diff --git
a/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
b/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
new file mode 100644
index 0000000..285ccc4
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/files/Install-dma-buf-h.patch
@@ -0,0 +1,12 @@
+Index: git/include/uapi/linux/Kbuild
+===================================================================
+--- git.orig/include/uapi/linux/Kbuild 2017-07-18 10:58:56.217022277 -0500
++++ git/include/uapi/linux/Kbuild 2017-07-18 16:04:47.096019372 -0500
+ header-y += dlm.h
+ header-y += dlm_netlink.h
+ header-y += dlm_plock.h
++header-y += dma-buf.h
+ header-y += dm-ioctl.h
+ header-y += dm-log-userspace.h
+ header-y += dn.h
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
new file mode 100644
index 0000000..1657df6
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -0,0 +1,91 @@
+SUMMARY = "Sanitized set of kernel headers for the C library's use"
+SECTION = "devel"
+LICENSE = "GPLv2"
+
+#########################################################################
+#### PLEASE READ
+#########################################################################
+#
+# You're probably looking here thinking you need to create some new copy
+# of linux-libc-headers since you have your own custom kernel. To put
+# this simply, you DO NOT.
+#
+# Why? These headers are used to build the libc. If you customise the
+# headers you are customising the libc and the libc becomes machine
+# specific. Most people do not add custom libc extensions to the kernel
+# and have a machine specific libc.
+#
+# But you have some kernel headers you need for some driver? That is fine
+# but get them from STAGING_KERNEL_DIR where the kernel installs itself.
+# This will make the package using them machine specific but this is much
+# better than having a machine specific C library. This does mean your
+# recipe needs a
+# do_configure[depends] += "virtual/kernel:do_shared_workdir"
+# but again, that is fine and makes total sense.
+#
+# There can also be a case where your kernel extremely old and you want
+# an older libc ABI for that old kernel. The headers installed by this
+# recipe should still be a standard mainline kernel, not your own custom
+# one.
+#
+# -- RP
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+python __anonymous () {
+ major = d.getVar("PV").split('.')[0]
+ d.setVar("HEADER_FETCH_VER", "3.0")
+ d.setVar("HEADER_FETCH_VER", "4.x")
+ d.setVar("HEADER_FETCH_VER", "2.6")
+}
+
+inherit kernel-arch pkgconfig multilib_header
+
+KORG_ARCHIVE_COMPRESSION ?= "xz"
+
+SRC_URI =
"${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.${KORG_ARCHIVE_COMPRESSION}"
+UPSTREAM_CHECK_URI = "https://www.kernel.org/"
+
+S = "${WORKDIR}/linux-${PV}"
+
+EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}""
+
+do_configure() {
+ oe_runmake allnoconfig
+}
+
+do_compile () {
+}
+
+do_install() {
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
+ # Kernel should not be exporting this header
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+ # The ..install.cmd conflicts between various configure runs
+ find ${D}${includedir} -name ..install.cmd | xargs rm -f
+}
+
+do_install_append_aarch64 () {
+ do_install_armmultilib
+}
+
+do_install_append_arm () {
+ do_install_armmultilib
+}
+
+do_install_armmultilib () {
+ oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h
asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/mman.h asm/param.h
asm/perf_regs.h
+ oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h
asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h
asm/swab.h asm/types.h asm/unistd.h
+}
+
+BBCLASSEXTEND = "nativesdk"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
b/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
new file mode 100644
index 0000000..d02c355
--- /dev/null
+++ b/recipes-kernel/linux-libc-headers/linux-libc-headers_4.9.bb
@@ -0,0 +1,11 @@
+require linux-libc-headers.inc
+
+SRC_URI_append_libc-musl = "\
+ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
+
file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \
+ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
+
file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
+ "
+
+SRC_URI[md5sum] = "0a68ef3615c64bd5ee54a3320e46667d"
+SRC_URI[sha256sum] =
"029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a"
--
1.9.1
--
_______________________________________________
meta-freescale mailing list
https://lists.yoctoproject.org/listinfo/meta-freescale

--
_______________________________________________
meta-freescale mailing list
https://lists.yoctoproject.org/listinfo/meta-freescale

[Otavio Salvador]

Post by Yuqing Zhu
Hold linux-libc-headers v4.9 in meta-freescale layer,
which matches the current linux-imx version in L4.9.123-2.3.0_8mm_ga.

I already reported multiple times that we cannot change this recipe.

Both Max and Gary raised the same concerns about it making all
packages machine specific which is forbidden. Please align with Tom
about the incoming work of using a set of imx specific headers
instead.

[Carol Zhu]

Hi Otavio,

Sorry for the late reply, I just come back from our National Day Holiday.

The current poky master has linux-libc-headers v4.18 but our kernel version is 4.9.123, the two version are mismatch.
And when compiling vpu hantro, I got build break.
It needs to do LINUX_VERSION_CODE check, which relies on the Linux/version.h from Linux-libc-headers.
So I have to downgrade the Linux-libc-headers to 4.9 to match with our kernel version.


B.R.
Carol
-----Original Message-----
From: Otavio Salvador <***@ossystems.com.br>
Sent: 2018年10月2日 1:49
To: Carol Zhu <***@nxp.com>; Tom Hochstein <***@nxp.com>
Cc: meta-freescale Mailing List <meta-***@yoctoproject.org>
Subject: Re: [meta-freescale] [PATCH 01/14] linux-libc-headers: Use linux-libc-headers v4.9 for L4.9.123-2.3.0_8mm_ga

Hold linux-libc-headers v4.9 in meta-freescale layer, which matches
the current linux-imx version in L4.9.123-2.3.0_8mm_ga.

I already reported multiple times that we cannot change this recipe.

Both Max and Gary raised the same concerns about it making all packages machine specific which is forbidden. Please align with Tom about the incoming work of using a set of imx specific headers instead.

--
Otavio Salvador O.S. Systems
https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.ossystems.com.br&amp;data=02%7C01%7Ccarol.zhu%40nxp.com%7Cb3d3ad002e774a24ae6808d627c633e2%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636740129563654748&amp;sdata=7gWSdDOkNN4c0EZiO7oXayw5X5Hum9JTo4XHCOvtYYQ%3D&amp;reserved=0 https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fcode.ossystems.com.br&amp;data=02%7C01%7Ccarol.zhu%40nxp.com%7Cb3d3ad002e774a24ae6808d627c633e2%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636740129563654748&amp;sdata=T4EZfBHWgktjyz00XYdVi0rZCADIMj9CXIRjgFPECus%3D&amp;reserved=0
Mobile: [phone] Mobile: [phone]
--

[Gary Bisson]

Hi Carol,

This is fixed already by pointing to the kernel header directly.
https://github.com/Freescale/meta-freescale/commit/387b285adc25aa244bfe90f4083320304af237c5
https://github.com/Freescale/meta-freescale/commit/476c63185e6864f82e938247235e7ad8ad20af4b

Changing the toolchain header is not flexible enough. First, this is Yocto,
but you need to think about people using other build systems like Buildroot
where such change will never be merged.

Also there's the case of people using pre-built toolchains, you can't
control their headers versions.

All in all, you shouldn't rely on toolchains headers, especially for
LINUX_VERSION_CODE.

Also, in the future, NXP will provide 4.14 kernel version, but what if
someone wants to stick to a 4.9 (GA) kernel? Do you plan on having
libc-headers for all next kernel releases? Doesn't sound like a scalable
approach.

Regards,

Gary Bisson
Boundary Devices, LLC
www.boundarydevices.com <http://www.BoundaryDevices.com>

Post by Gary Bisson
Hi Otavio,
Sorry for the late reply, I just come back from our National Day Holiday.
The current poky master has linux-libc-headers v4.18 but our kernel
version is 4.9.123, the two version are mismatch.
And when compiling vpu hantro, I got build break.
It needs to do LINUX_VERSION_CODE check, which relies on the
Linux/version.h from Linux-libc-headers.
So I have to downgrade the Linux-libc-headers to 4.9 to match with our kernel version.
B.R.
Carol
-----Original Message-----
Sent: 2018幎10月2日 1:49
Subject: Re: [meta-freescale] [PATCH 01/14] linux-libc-headers: Use
linux-libc-headers v4.9 for L4.9.123-2.3.0_8mm_ga

Hold linux-libc-headers v4.9 in meta-freescale layer, which matches
the current linux-imx version in L4.9.123-2.3.0_8mm_ga.

I already reported multiple times that we cannot change this recipe.
Both Max and Gary raised the same concerns about it making all packages
machine specific which is forbidden. Please align with Tom about the
incoming work of using a set of imx specific headers instead.
--
Otavio Salvador O.S. Systems
https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.ossystems.com.br&amp;data=02%7C01%7Ccarol.zhu%40nxp.com%7Cb3d3ad002e774a24ae6808d627c633e2%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636740129563654748&amp;sdata=7gWSdDOkNN4c0EZiO7oXayw5X5Hum9JTo4XHCOvtYYQ%3D&amp;reserved=0
https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fcode.ossystems.com.br&amp;data=02%7C01%7Ccarol.zhu%40nxp.com%7Cb3d3ad002e774a24ae6808d627c633e2%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636740129563654748&amp;sdata=T4EZfBHWgktjyz00XYdVi0rZCADIMj9CXIRjgFPECus%3D&amp;reserved=0
Mobile: [phone] Mobile: [phone]

[Carol Zhu]

Hi Gary,

I updated my local build env to the latest master branch and try building the vpu hantro.
But I got a small build issue:
| ./ewl/ewl_x280_common.c: In function 'EWLMallocLinear':
| ./ewl/ewl_x280_common.c:775:25: error: storage size of 'dma_phys' isn't known
| struct dma_buf_phys dma_phys;
| ^~~~~~~~
| ./ewl/ewl_x280_common.c:799:17: warning: assignment to '__u64' {aka 'long long unsigned int'} from 'struct ion_heap_data (*)[(sizetype)(heap_cnt)]' makes integer from pointer without a cast [-Wint-conversion]
| query.heaps = &ihd;
| ^
| ./ewl/ewl_x280_common.c:819:35: error: 'struct ion_allocation_data' has no member named 'fd'
| info->ion_fd = allocation_data.fd;
| ^
| ./ewl/ewl_x280_common.c:821:31: error: 'DMA_BUF_IOCTL_PHYS' undeclared (first use in this function); did you mean 'DMA_BUF_IOCTL_SYNC'?
| ret = ioctl(info->ion_fd, DMA_BUF_IOCTL_PHYS, &dma_phys);
| ^~~~~~~~~~~~~~~~~~
| DMA_BUF_IOCTL_SYNC

It goes into >k4.14 branch as the incorrect LINUX_VERSION_CODE, so I did a update about the include directory of version.h, plz take a check.
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0002-Fix-version.h-inclusion-to-be-from-kernel-build-fold.patch
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0002-Fix-version.h-inclusion-to-be-from-kernel-build-fold.patch
@@ -34,7 +34,7 @@ index 56b4332..0be43ce 100755
ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi

+# LINUX_VERSION_CODE from kernel build folder instead of toolchain headers
-+INCLUDE_HEADERS += -I$(LINUX_KERNEL_BUILD)/include/generated/uapi
++ENV += -I$(LINUX_KERNEL_BUILD)/include/generated/uapi


B.R.
Carol

From: Carol Zhu
Sent: 2018幎10月8日 15:23
To: 'Gary Bisson' <***@boundarydevices.com>
Cc: Otavio Salvador <***@ossystems.com.br>; Max Krummenacher <***@gmail.com>; Bing Song <***@nxp.com>; Eagle Zhou <***@nxp.com>; Tom Hochstein <***@nxp.com>; meta-freescale Mailing List <meta-***@yoctoproject.org>; Jun Zhu <***@nxp.com>
Subject: RE: [meta-freescale] [PATCH 01/14] linux-libc-headers: Use linux-libc-headers v4.9 for L4.9.123-2.3.0_8mm_ga

Hi Gary,

Thanks for your fix. It looks flexible and do fix the build problem.
But I am still a little bit confused.
For my understanding, the version of libc-headers should match the one of kernel, or the compatibility couldn’t be guaranteed.
And our current release maintain both libc-header and Linux-imx recipes to make them version match.
eg: https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imx/meta-bsp/recipes-kernel/linux-libc-headers?h=rocko-4.9.123-2.3.0_8mm_ga
For people using pre-built toolchains, they’re supposed to choose proper version, which would be better.
If libc-headers could be backwards compatible except this “LINUX_VERSION_CODE”, then it’s ok with version mismatch.

B.R.
Carol
From: Gary Bisson <***@boundarydevices.com<mailto:***@boundarydevices.com>>
Sent: 2018幎10月8日 13:41
To: Carol Zhu <***@nxp.com<mailto:***@nxp.com>>
Cc: Otavio Salvador <***@ossystems.com.br<mailto:***@ossystems.com.br>>; Max Krummenacher <***@gmail.com<mailto:***@gmail.com>>; Bing Song <***@nxp.com<mailto:***@nxp.com>>; Eagle Zhou <***@nxp.com<mailto:***@nxp.com>>; Tom Hochstein <***@nxp.com<mailto:***@nxp.com>>; meta-freescale Mailing List <meta-***@yoctoproject.org<mailto:meta-***@yoctoproject.org>>; Jun Zhu <***@nxp.com<mailto:***@nxp.com>>
Subject: Re: [meta-freescale] [PATCH 01/14] linux-libc-headers: Use linux-libc-headers v4.9 for L4.9.123-2.3.0_8mm_ga

Hi Carol,

This is fixed already by pointing to the kernel header directly.
https://github.com/Freescale/meta-freescale/commit/387b285adc25aa244bfe90f4083320304af237c5<https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FFreescale%2Fmeta-freescale%2Fcommit%2F387b285adc25aa244bfe90f4083320304af237c5&data=02%7C01%7Ccarol.zhu%40nxp.com%7C654b648140334e84263808d62ce0aa1e%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636745740783724551&sdata=UOwKTxkpJkS8RrYN%2FpcPN%2Bw7PzvH80uEhPZ1s641cJA%3D&reserved=0>
https://github.com/Freescale/meta-freescale/commit/476c63185e6864f82e938247235e7ad8ad20af4b<https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FFreescale%2Fmeta-freescale%2Fcommit%2F476c63185e6864f82e938247235e7ad8ad20af4b&data=02%7C01%7Ccarol.zhu%40nxp.com%7C654b648140334e84263808d62ce0aa1e%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636745740783734564&sdata=VqJwukIDu8zLnmPIgQvGUcpFvMN7YnZnH4bgXUIy3HE%3D&reserved=0>

Changing the toolchain header is not flexible enough. First, this is Yocto, but you need to think about people using other build systems like Buildroot where such change will never be merged.

Also there's the case of people using pre-built toolchains, you can't control their headers versions.

All in all, you shouldn't rely on toolchains headers, especially for LINUX_VERSION_CODE.

Also, in the future, NXP will provide 4.14 kernel version, but what if someone wants to stick to a 4.9 (GA) kernel? Do you plan on having libc-headers for all next kernel releases? Doesn't sound like a scalable approach.

Regards,

Gary Bisson
Boundary Devices, LLC
www.boundarydevices.com<https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.BoundaryDevices.com&data=02%7C01%7Ccarol.zhu%40nxp.com%7C654b648140334e84263808d62ce0aa1e%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636745740783744573&sdata=9qHz%2F0HecMxcspuAz%2B%2FJSjznf3q3YegF7P%2B5U%2B5R6tA%3D&reserved=0>


On Mon, Oct 8, 2018 at 5:15 AM Carol Zhu <***@nxp.com<mailto:***@nxp.com>> wrote:
Hi Otavio,

Sorry for the late reply, I just come back from our National Day Holiday.

The current poky master has linux-libc-headers v4.18 but our kernel version is 4.9.123, the two version are mismatch.
And when compiling vpu hantro, I got build break.
It needs to do LINUX_VERSION_CODE check, which relies on the Linux/version.h from Linux-libc-headers.
So I have to downgrade the Linux-libc-headers to 4.9 to match with our kernel version.


B.R.
Carol
-----Original Message-----
From: Otavio Salvador <***@ossystems.com.br<mailto:***@ossystems.com.br>>
Sent: 2018幎10月2日 1:49
To: Carol Zhu <***@nxp.com<mailto:***@nxp.com>>; Tom Hochstein <***@nxp.com<mailto:***@nxp.com>>
Cc: meta-freescale Mailing List <meta-***@yoctoproject.org<mailto:meta-***@yoctoproject.org>>
Subject: Re: [meta-freescale] [PATCH 01/14] linux-libc-headers: Use linux-libc-headers v4.9 for L4.9.123-2.3.0_8mm_ga

Hold linux-libc-headers v4.9 in meta-freescale layer, which matches
the current linux-imx version in L4.9.123-2.3.0_8mm_ga.

I already reported multiple times that we cannot change this recipe.

Both Max and Gary raised the same concerns about it making all packages machine specific which is forbidden. Please align with Tom about the incoming work of using a set of imx specific headers instead.

[Gary Bisson]

Hi Carol,

Post by Carol Zhu
Hi Gary,
I updated my local build env to the latest master branch and try building the vpu hantro.
| ./ewl/ewl_x280_common.c:775:25: error: storage size of 'dma_phys' isn't known
| struct dma_buf_phys dma_phys;
| ^~~~~~~~
| ./ewl/ewl_x280_common.c:799:17: warning: assignment to '__u64' {aka
'long long unsigned int'} from 'struct ion_heap_data
(*)[(sizetype)(heap_cnt)]' makes integer from pointer without a cast
[-Wint-conversion]
| query.heaps = &ihd;
| ^
| ./ewl/ewl_x280_common.c:819:35: error: 'struct ion_allocation_data' has
no member named 'fd'
| info->ion_fd = allocation_data.fd;
| ^
| ./ewl/ewl_x280_common.c:821:31: error: 'DMA_BUF_IOCTL_PHYS' undeclared
(first use in this function); did you mean 'DMA_BUF_IOCTL_SYNC'?
| ret = ioctl(info->ion_fd, DMA_BUF_IOCTL_PHYS, &dma_phys);
| ^~~~~~~~~~~~~~~~~~
| DMA_BUF_IOCTL_SYNC

What platform are you building for?

I only tried 8M (Nitrogen8M) and this worked for me. But maybe the encoder
part needs to be modified for 8MM.

It goes into >k4.14 branch as the incorrect LINUX_VERSION_CODE, so I did a

Post by Carol Zhu
update about the include directory of version.h, plz take a check.
---
a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0002-Fix-version.h-inclusion-to-be-from-kernel-build-fold.patch
+++
b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0002-Fix-version.h-inclusion-to-be-from-kernel-build-fold.patch
@@ -34,7 +34,7 @@ index 56b4332..0be43ce 100755
ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
+# LINUX_VERSION_CODE from kernel build folder instead of toolchain headers
-+INCLUDE_HEADERS += -I$(LINUX_KERNEL_BUILD)/include/generated/uapi
++ENV += -I$(LINUX_KERNEL_BUILD)/include/generated/uapi

If you have a fix please submit it.

<snip>

Post by Carol Zhu
Thanks for your fix. It looks flexible and do fix the build problem.
But I am still a little bit confused.
For my understanding, the version of libc-headers should match the one of
kernel, or the compatibility couldn’t be guaranteed.

No the toolchain header doesn't have to match the kernel version exactly as
the ABI is backward compatible.

Post by Carol Zhu
And our current release maintain both libc-header and Linux-imx recipes to
make them version match.
eg: https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imKernel
headerx/meta-bsp/recipes-kernel/linux-libc-headers?h=rocko-4.9.123-2.3.0_8mm_ga
<https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imx/meta-bsp/recipes-kernel/linux-libc-headers?h=rocko-4.9.123-2.3.0_8mm_ga>
For people using pre-built toolchains, they’re supposed to choose proper
version, which would be better.

As ABI is backwards compatible, people shouldn't have to worry about kernel
headers:
https://elinux.org/images/1/15/Anatomy_of_Cross-Compilation_Toolchains.pdf

If libc-headers could be backwards compatible except this “

Post by Carol Zhu
LINUX_VERSION_CODE”, then it’s ok with version mismatch.

Exactly, if the issue is only LINUX_VERSION_CODE then it should be taken
from kernel directly.

Also, since some headers are NXP-specific (ion.h), then even if you use a
pre-built toolchain with same version headers it won't work anyway as those
headers will be missing.

Regards,
Gary

[Carol Zhu]

Hi Gary,

My platform is 8mm and yes, the h1 encoder part needs to be modified.
I’ll submit a patch about this.
Thanks.


B.R.
Carol
From: Gary Bisson <***@boundarydevices.com>
Sent: 2018幎10月8日 19:50
To: Carol Zhu <***@nxp.com>
Cc: Otavio Salvador <***@ossystems.com.br>; Max Krummenacher <***@gmail.com>; Bing Song <***@nxp.com>; Eagle Zhou <***@nxp.com>; Tom Hochstein <***@nxp.com>; meta-freescale Mailing List <meta-***@yoctoproject.org>; Jun Zhu <***@nxp.com>
Subject: Re: [meta-freescale] [PATCH 01/14] linux-libc-headers: Use linux-libc-headers v4.9 for L4.9.123-2.3.0_8mm_ga

Hi Carol,

On Mon, Oct 8, 2018 at 11:30 AM Carol Zhu <***@nxp.com<mailto:***@nxp.com>> wrote:
Hi Gary,

I updated my local build env to the latest master branch and try building the vpu hantro.
But I got a small build issue:
| ./ewl/ewl_x280_common.c: In function 'EWLMallocLinear':
| ./ewl/ewl_x280_common.c:775:25: error: storage size of 'dma_phys' isn't known
| struct dma_buf_phys dma_phys;
| ^~~~~~~~
| ./ewl/ewl_x280_common.c:799:17: warning: assignment to '__u64' {aka 'long long unsigned int'} from 'struct ion_heap_data (*)[(sizetype)(heap_cnt)]' makes integer from pointer without a cast [-Wint-conversion]
| query.heaps = &ihd;
| ^
| ./ewl/ewl_x280_common.c:819:35: error: 'struct ion_allocation_data' has no member named 'fd'
| info->ion_fd = allocation_data.fd;
| ^
| ./ewl/ewl_x280_common.c:821:31: error: 'DMA_BUF_IOCTL_PHYS' undeclared (first use in this function); did you mean 'DMA_BUF_IOCTL_SYNC'?
| ret = ioctl(info->ion_fd, DMA_BUF_IOCTL_PHYS, &dma_phys);
| ^~~~~~~~~~~~~~~~~~
| DMA_BUF_IOCTL_SYNC

What platform are you building for?

I only tried 8M (Nitrogen8M) and this worked for me. But maybe the encoder part needs to be modified for 8MM.

It goes into >k4.14 branch as the incorrect LINUX_VERSION_CODE, so I did a update about the include directory of version.h, plz take a check.
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0002-Fix-version.h-inclusion-to-be-from-kernel-build-fold.patch
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0002-Fix-version.h-inclusion-to-be-from-kernel-build-fold.patch
@@ -34,7 +34,7 @@ index 56b4332..0be43ce 100755
ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi

+# LINUX_VERSION_CODE from kernel build folder instead of toolchain headers
-+INCLUDE_HEADERS += -I$(LINUX_KERNEL_BUILD)/include/generated/uapi
++ENV += -I$(LINUX_KERNEL_BUILD)/include/generated/uapi

If you have a fix please submit it.

<snip>
Thanks for your fix. It looks flexible and do fix the build problem.
But I am still a little bit confused.
For my understanding, the version of libc-headers should match the one of kernel, or the compatibility couldn’t be guaranteed.

No the toolchain header doesn't have to match the kernel version exactly as the ABI is backward compatible.

And our current release maintain both libc-header and Linux-imx recipes to make them version match.
eg: https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imKernel headerx/meta-bsp/recipes-kernel/linux-libc-headers?h=rocko-4.9.123-2.3.0_8mm_ga<https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsource.codeaurora.org%2Fexternal%2Fimx%2Fmeta-fsl-bsp-release%2Ftree%2Fimx%2Fmeta-bsp%2Frecipes-kernel%2Flinux-libc-headers%3Fh%3Drocko-4.9.123-2.3.0_8mm_ga&data=02%7C01%7Ccarol.zhu%40nxp.com%7Cd15c89e71f234bffae2108d62d142f1a%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636745962056160606&sdata=L1Tmr%2FyYeVnIcIrF6BlL%2FKXPc52gw3HR5U7%2FyvAS%2F74%3D&reserved=0>
For people using pre-built toolchains, they’re supposed to choose proper version, which would be better.

As ABI is backwards compatible, people shouldn't have to worry about kernel headers:
https://elinux.org/images/1/15/Anatomy_of_Cross-Compilation_Toolchains.pdf<https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Felinux.org%2Fimages%2F1%2F15%2FAnatomy_of_Cross-Compilation_Toolchains.pdf&data=02%7C01%7Ccarol.zhu%40nxp.com%7Cd15c89e71f234bffae2108d62d142f1a%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636745962056170614&sdata=Yq3Lzvr5MHGGMlZXi0fYLeW6NCGrVvB1zop7lAzoVfY%3D&reserved=0>

If libc-headers could be backwards compatible except this “LINUX_VERSION_CODE”, then it’s ok with version mismatch.

Exactly, if the issue is only LINUX_VERSION_CODE then it should be taken from kernel directly.

Also, since some headers are NXP-specific (ion.h), then even if you use a pre-built toolchain with same version headers it won't work anyway as those headers will be missing.

Regards,
Gary

[Yuqing Zhu]

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
.../{linux-imx-mfgtool-4.9.88 => linux-imx-mfgtool-4.9.123}/defconfig | 0
.../linux/{linux-imx-mfgtool_4.9.88.bb => linux-imx-mfgtool_4.9.123.bb} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename recipes-kernel/linux/{linux-imx-mfgtool-4.9.88 => linux-imx-mfgtool-4.9.123}/defconfig (100%)
rename recipes-kernel/linux/{linux-imx-mfgtool_4.9.88.bb => linux-imx-mfgtool_4.9.123.bb} (100%)

diff --git a/recipes-kernel/linux/linux-imx-mfgtool-4.9.88/defconfig b/recipes-kernel/linux/linux-imx-mfgtool-4.9.123/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-imx-mfgtool-4.9.88/defconfig
rename to recipes-kernel/linux/linux-imx-mfgtool-4.9.123/defconfig
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_4.9.88.bb b/recipes-kernel/linux/linux-imx-mfgtool_4.9.123.bb
similarity index 100%
rename from recipes-kernel/linux/linux-imx-mfgtool_4.9.88.bb
rename to recipes-kernel/linux/linux-imx-mfgtool_4.9.123.bb

[Yuqing Zhu]

Update to L4.9.123-2.3.0_8mm_ga release, with support for i.MX 8MM.

Update the defconfig from arch/arm64/configs.

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
.../imx/defconfig | 0
.../mx8/defconfig | 16 +++++++++++++++-
.../linux/{linux-imx_4.9.88.bb => linux-imx_4.9.123.bb} | 4 ++--
3 files changed, 17 insertions(+), 3 deletions(-)
rename recipes-kernel/linux/{linux-imx-4.9.88 => linux-imx-4.9.123}/imx/defconfig (100%)
rename recipes-kernel/linux/{linux-imx-4.9.88 => linux-imx-4.9.123}/mx8/defconfig (97%)
rename recipes-kernel/linux/{linux-imx_4.9.88.bb => linux-imx_4.9.123.bb} (86%)

diff --git a/recipes-kernel/linux/linux-imx-4.9.88/imx/defconfig b/recipes-kernel/linux/linux-imx-4.9.123/imx/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-imx-4.9.88/imx/defconfig
rename to recipes-kernel/linux/linux-imx-4.9.123/imx/defconfig
diff --git a/recipes-kernel/linux/linux-imx-4.9.88/mx8/defconfig b/recipes-kernel/linux/linux-imx-4.9.123/mx8/defconfig
similarity index 97%
rename from recipes-kernel/linux/linux-imx-4.9.88/mx8/defconfig
rename to recipes-kernel/linux/linux-imx-4.9.123/mx8/defconfig
index 5d977a0..f7df110 100644
--- a/recipes-kernel/linux/linux-imx-4.9.88/mx8/defconfig
+++ b/recipes-kernel/linux/linux-imx-4.9.123/mx8/defconfig
@@ -248,10 +248,13 @@ CONFIG_HOSTAP=y
CONFIG_RTL_CARDS=m
# CONFIG_WLAN_VENDOR_TI is not set
CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_IVSHMEM_NET=y
CONFIG_INPUT_POLLDEV=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_IMX_SC_PWRKEY=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PM8941_PWRKEY=y
CONFIG_INPUT_HISI_POWERKEY=y
@@ -298,6 +301,7 @@ CONFIG_I2C_UNIPHIER_F=y
CONFIG_I2C_RCAR=y
CONFIG_I2C_CROS_EC_TUNNEL=y
CONFIG_SPI=y
+CONFIG_SPI_IMX=y
CONFIG_SPI_FSL_LPSPI=y
CONFIG_SPI_MESON_SPIFC=m
CONFIG_SPI_ORION=y
@@ -321,6 +325,8 @@ CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_MAX77620=y
+CONFIG_POWER_AVS=y
+CONFIG_ROCKCHIP_IODOMAIN=y
CONFIG_POWER_RESET_MSM=y
CONFIG_POWER_RESET_XGENE=y
CONFIG_POWER_RESET_SYSCON=y
@@ -334,6 +340,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_EMULATION=y
CONFIG_IMX8M_THERMAL=y
+CONFIG_IMX8MM_THERMAL=y
CONFIG_IMX_SC_THERMAL=y
CONFIG_DEVICE_THERMAL=y
CONFIG_EXYNOS_THERMAL=y
@@ -377,6 +384,7 @@ CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_IMX_DPU_CORE=y
CONFIG_IMX_DCSS_CORE=y
+CONFIG_IMX_LCDIF_CORE=y
CONFIG_DRM=y
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_VIVANTE=m
@@ -391,6 +399,7 @@ CONFIG_DRM_IMX_TVE=y
CONFIG_DRM_IMX_LDB=y
CONFIG_DRM_IMX_HDMI=y
CONFIG_DRM_IMX_NWL_DSI=y
+CONFIG_DRM_IMX_SEC_DSIM=y
CONFIG_DRM_IMX_HDP=y
CONFIG_IMX_HDP_CEC=y
CONFIG_DRM_HISI_KIRIN=m
@@ -420,6 +429,8 @@ CONFIG_SND_SOC_IMX_WM8960=y
CONFIG_SND_SOC_IMX_WM8524=y
CONFIG_SND_SOC_IMX_CS42888=y
CONFIG_SND_SOC_IMX_WM8962=y
+CONFIG_SND_SOC_IMX_MICFIL=y
+CONFIG_SND_SOC_IMX_RPMSG=y
CONFIG_SND_SOC_IMX_MQS=y
CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_IMX_AMIX=y
@@ -541,6 +552,8 @@ CONFIG_QCOM_BAM_DMA=y
CONFIG_QCOM_HIDMA_MGMT=y
CONFIG_QCOM_HIDMA=y
CONFIG_RCAR_DMAC=y
+CONFIG_UIO=y
+CONFIG_UIO_PCI_GENERIC=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_MMIO=y
@@ -577,6 +590,7 @@ CONFIG_IIO=y
CONFIG_EXYNOS_ADC=y
CONFIG_IMX8QXP_ADC=y
CONFIG_PWM=y
+CONFIG_PWM_FSL_FTM=y
CONFIG_PWM_IMX=y
CONFIG_PWM_SAMSUNG=y
CONFIG_PWM_TEGRA=m
@@ -662,4 +676,4 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
CONFIG_CRYPTO_GHASH_ARM64_CE=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_CRC32_ARM64=y
\ No newline at end of file
+CONFIG_CRYPTO_CRC32_ARM64=y
diff --git a/recipes-kernel/linux/linux-imx_4.9.88.bb b/recipes-kernel/linux/linux-imx_4.9.123.bb
similarity index 86%
rename from recipes-kernel/linux/linux-imx_4.9.88.bb
rename to recipes-kernel/linux/linux-imx_4.9.123.bb
index 82355fd..c709249 100644
--- a/recipes-kernel/linux/linux-imx_4.9.88.bb
+++ b/recipes-kernel/linux/linux-imx_4.9.123.bb
@@ -11,9 +11,9 @@ require recipes-kernel/linux/linux-imx.inc

DEPENDS += "lzop-native bc-native"

-SRCBRANCH = "imx_4.9.88_imx8qxp_beta2"
+SRCBRANCH = "imx_4.9.123_imx8mm_ga"
LOCALVERSION = "-${SRCBRANCH}"
-SRCREV = "05f46d3f9b4a8987edac62a52528d52f47cfa42d"
+SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70"

DEFAULT_PREFERENCE = "1"

[Yuqing Zhu]

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
recipes-bsp/u-boot/u-boot-imx_2017.03.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

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 cc2fc12..f80aa59 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
@@ -10,9 +10,9 @@ PROVIDES += "u-boot"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"

-SRCBRANCH = "imx_v2017.03_4.9.88_imx8qxp_beta2"
+SRCBRANCH = "imx_v2017.03_4.9.123_imx8mm_ga"
SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "84c4e820340c0e76b1f14416536ff1fae08f120b"
+SRCREV = "8be98e9322040c655b9e5c9fb2c494e002e3fad9"

S = "${WORKDIR}/git"

[Yuqing Zhu]

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
conf/machine/imx8mmevk.conf | 58 +++++++++++++++++++++++++++++++++++++++
conf/machine/include/imx-base.inc | 3 ++
2 files changed, 61 insertions(+)
create mode 100644 conf/machine/imx8mmevk.conf

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
new file mode 100644
index 0000000..8d1c6e5
--- /dev/null
+++ b/conf/machine/imx8mmevk.conf
@@ -0,0 +1,58 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX8MM Evaluation Kit
+#@SOC: i.MX8MM
+#@DESCRIPTION: Machine configuration for NXP i.MX8MMini EVK
+#@MAINTAINER: Jun Zhu <***@nxp.com>
+
+MACHINEOVERRIDES =. "mx8:mx8mm:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+MACHINE_FEATURES += " pci wifi bluetooth optee qca9377 qca6174"
+
+MACHINE_SOCARCH_FILTER_append_mx8mm = "virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
+
+KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-ak4497.dtb freescale/fsl-imx8mm-evk-ak5558.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-audio-tdm.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-inmate.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-m4.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-rm67191.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-root.dtb"
+
+IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
+IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin \
+ imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+ imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
+ imx8mm_m4_TCM_sai_low_power_audio.bin \
+"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard"
+UBOOT_CONFIG[fspi] = "imx8mm_evk_fspi_defconfig"
+UBOOT_CONFIG[mfgtool] = "imx8mm_evk_config"
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+# Set DDR FIRMWARE
+DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
+
+# Set u-boot DTB
+UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb"
+
+# Set imx-mkimage boot target
+IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}"
+
+# Set Serial console
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+IMAGE_BOOTLOADER = "imx-boot"
+
+BOOT_SPACE = "65536"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+IMX_BOOT_SEEK = "33"
+
+OPTEE_BIN_EXT = "8mm"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 81f521e..e4c7435 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -71,6 +71,7 @@ MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"

@@ -90,6 +91,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
\
mx8 \
mx8qm \
+ mx8mm \
mx8mq \
mx8qxp \
"
@@ -112,6 +114,7 @@ MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul"
MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
MACHINE_SOCARCH_SUFFIX_mx8qm = "-mx8"
+MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm"
MACHINE_SOCARCH_SUFFIX_mx8mq = "-mx8m"
MACHINE_SOCARCH_SUFFIX_mx8qxp = "-mx8x"
MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"

[Otavio Salvador]

Post by Yuqing Zhu
---
conf/machine/imx8mmevk.conf | 58 +++++++++++++++++++++++++++++++++++++++
conf/machine/include/imx-base.inc | 3 ++
2 files changed, 61 insertions(+)
create mode 100644 conf/machine/imx8mmevk.conf
diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
new file mode 100644
index 0000000..8d1c6e5
--- /dev/null
+++ b/conf/machine/imx8mmevk.conf
@@ -0,0 +1,58 @@
+
+MACHINEOVERRIDES =. "mx8:mx8mm:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+MACHINE_FEATURES += " pci wifi bluetooth optee qca9377 qca6174"
+
+MACHINE_SOCARCH_FILTER_append_mx8mm = "virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
+
+KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-ak4497.dtb freescale/fsl-imx8mm-evk-ak5558.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-audio-tdm.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-inmate.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-m4.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-rm67191.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-root.dtb"
+
+IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
+IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin \
+ imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+ imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
+ imx8mm_m4_TCM_sai_low_power_audio.bin \
+"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard"
+UBOOT_CONFIG[fspi] = "imx8mm_evk_fspi_defconfig"
+UBOOT_CONFIG[mfgtool] = "imx8mm_evk_config"
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+# Set DDR FIRMWARE
+DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
+
+# Set u-boot DTB
+UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb"
+
+# Set imx-mkimage boot target
+
+# Set Serial console
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+IMAGE_BOOTLOADER = "imx-boot"
+
+BOOT_SPACE = "65536"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+IMX_BOOT_SEEK = "33"
+
+OPTEE_BIN_EXT = "8mm"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 81f521e..e4c7435 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -71,6 +71,7 @@ MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"

This uses same as QM and below you set it to another SUFFIX. What are
the differences?

[Gary Bisson]

Hi Otavio,

On Mon, Oct 1, 2018 at 8:00 PM Otavio Salvador <

Post by Yuqing Zhu

Post by Yuqing Zhu
---
conf/machine/imx8mmevk.conf | 58

+++++++++++++++++++++++++++++++++++++++

Post by Yuqing Zhu
conf/machine/include/imx-base.inc | 3 ++
2 files changed, 61 insertions(+)
create mode 100644 conf/machine/imx8mmevk.conf
diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
new file mode 100644
index 0000000..8d1c6e5
--- /dev/null
+++ b/conf/machine/imx8mmevk.conf
@@ -0,0 +1,58 @@
+
+MACHINEOVERRIDES =. "mx8:mx8mm:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+MACHINE_FEATURES += " pci wifi bluetooth optee qca9377 qca6174"
+
+MACHINE_SOCARCH_FILTER_append_mx8mm = "virtual/libopenvg

virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl
virtual/libg2d"

Post by Yuqing Zhu
+
+KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-ak4497.dtb

freescale/fsl-imx8mm-evk-ak5558.dtb "

Post by Yuqing Zhu
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-audio-tdm.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-inmate.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-m4.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-rm67191.dtb "
+KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-root.dtb"
+
+IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
+IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin \
+

imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \

Post by Yuqing Zhu
+ imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
+ imx8mm_m4_TCM_sai_low_power_audio.bin \
+"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard"
+UBOOT_CONFIG[fspi] = "imx8mm_evk_fspi_defconfig"
+UBOOT_CONFIG[mfgtool] = "imx8mm_evk_config"
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+# Set DDR FIRMWARE
+DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin

lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin
lpddr4_pmu_train_2d_dmem.bin"

Post by Yuqing Zhu
+
+# Set u-boot DTB
+UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb"
+
+# Set imx-mkimage boot target

'flash_evk_flexspi', 'flash_evk', d)}"

Post by Yuqing Zhu
+
+# Set Serial console
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+IMAGE_BOOTLOADER = "imx-boot"
+
+BOOT_SPACE = "65536"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+IMX_BOOT_SEEK = "33"
+
+OPTEE_BIN_EXT = "8mm"
diff --git a/conf/machine/include/imx-base.inc

b/conf/machine/include/imx-base.inc

Post by Yuqing Zhu
index 81f521e..e4c7435 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -71,6 +71,7 @@ MACHINEOVERRIDES_EXTENDER_mx6ull =

"imxfbdev:imxpxp:imxepdc"

Post by Yuqing Zhu
MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc"
MACHINEOVERRIDES_EXTENDER_mx7ulp =

"imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"

Post by Yuqing Zhu
MACHINEOVERRIDES_EXTENDER_mx8qm =

"imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"

Post by Yuqing Zhu
+MACHINEOVERRIDES_EXTENDER_mx8mm =

"imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
This uses same as QM and below you set it to another SUFFIX. What are
the differences?

No actually it isn't the same, QM has imxdpu whereas 8MM doesn't.

There are many differences between 8MM and the other 8 series. It is
closest to 8MQ but has gpu2d + vpu encoder.

I don't think we can avoid creating a new suffix.

One other difference, 8MM is the only 8 that doesn't support OpenGL3.0.

Regards,
Gary

[Yuqing Zhu]

v4l2videodec:
Add more video format support: RMVB/VP6/AVS/Sorenson SPARK/DivX

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb
index cdd73dd..06effc9 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"

GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.04.00_1805_L4.9.88_MX8QXP_BETA2"
+SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA"

SRC_URI = " \
${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \
"
-SRCREV = "037e2bf9a152de410623235974c68be21948985a"
+SRCREV = "f25cda9043fee159197898bb810d6e64f2a11140"

DEFAULT_PREFERENCE = "-1"

[Yuqing Zhu]

Add support for i.MX8MMEVK
Update EULA to V26
Update ion header inclusion patch

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
...Fix-ion.h-header-inclusion-to-be-standard.patch | 85 +++++++++++++++-------
...vpu-hantro_1.7.0.bb => imx-vpu-hantro_1.8.0.bb} | 10 ++-
2 files changed, 65 insertions(+), 30 deletions(-)
rename recipes-bsp/imx-vpu-hantro/{imx-vpu-hantro_1.7.0.bb => imx-vpu-hantro_1.8.0.bb} (66%)

diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
index e7b23f7..2773100 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
@@ -1,41 +1,74 @@
-From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001
-From: Gary Bisson <***@boundarydevices.com>
-Date: Thu, 12 Jul 2018 11:38:28 +0200
-Subject: [PATCH] Fix ion.h header inclusion to be standard
+From cf67cfecc01538e32cd99e3ca00ff0e6145079ce Mon Sep 17 00:00:00 2001
+From: Yuqing Zhu <***@nxp.com>
+Date: Thu, 27 Sep 2018 15:34:11 +0800
+Subject: [PATCH] imx-vpu-hantro: Fix ion.h header inclusion to be standard

NXP "solution" was to manually copy the header to include/linux.
Let's point the Makefile to the proper (mainline) location instead:
https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h

-Signed-off-by: Gary Bisson <***@boundarydevices.com>
+Signed-off-by: Yuqing Zhu <***@nxp.com>
---
- Makefile | 2 ++
- decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ Makefile_G1G2 | 3 +++
+ Makefile_H1 | 3 +++
+ decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
+ h1_encoder/software/linux_reference/ewl/ewl_x280_common.c | 2 +-
+ 4 files changed, 8 insertions(+), 2 deletions(-)

-Index: imx-vpu-hantro-1.7.0/decoder_sw/software/linux/dwl/dwl_linux.c
-===================================================================
---- imx-vpu-hantro-1.7.0.orig/decoder_sw/software/linux/dwl/dwl_linux.c
-+++ imx-vpu-hantro-1.7.0/decoder_sw/software/linux/dwl/dwl_linux.c
+diff --git a/Makefile_G1G2 b/Makefile_G1G2
+index caab40f..29866a4 100755
+--- a/Makefile_G1G2
++++ b/Makefile_G1G2
+@@ -13,6 +13,9 @@ INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc
+ #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver
+ INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+
++# ION header location
++INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
++
+ CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
+ -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \
+ -DDEC_X170_OUTPUT_FORMAT=0 -DDEC_X170_TIMEOUT_LENGTH=-1 -DENABLE_HEVC_SUPPORT \
+diff --git a/Makefile_H1 b/Makefile_H1
+index 9ca1aa9..56b4332 100755
+--- a/Makefile_H1
++++ b/Makefile_H1
+@@ -20,6 +20,9 @@ ENV += -DUSE_ION
+ ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+ ENV += -I$(SDKTARGETSYSROOT)/usr/imx/include
+
++# ION header location
++ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
++
+ LIBENCNAME = libcodec_enc
+ LIBSENC = -L./ -lhantro_h1 -lpthread
+
+diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
+index 0899596..f2e1229 100755
+--- a/decoder_sw/software/linux/dwl/dwl_linux.c
++++ b/decoder_sw/software/linux/dwl/dwl_linux.c
@@ -41,7 +41,7 @@
#include "dwl.h"
#include <linux/hantrodec.h>
#ifdef USE_ION
-#include <linux/ion.h>
+#include <ion.h>
+ #include <linux/dma-buf.h>
+ #include <linux/version.h>
#ifdef ANDROID
- #include <linux/mxc_ion.h>
- #endif
-Index: imx-vpu-hantro-1.7.0/Makefile_G1G2
-===================================================================
---- imx-vpu-hantro-1.7.0.orig/Makefile_G1G2
-+++ imx-vpu-hantro-1.7.0/Makefile_G1G2
-@@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOU
- INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc
- #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver
- INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
-+# ION header location
-+INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
+diff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
+index 620c978..82b4836 100755
+--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
++++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
+@@ -49,7 +49,7 @@

- CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
- -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \
+ #include "linux/hx280enc.h"
+ #ifdef USE_ION
+-#include <linux/ion.h>
++#include <ion.h>
+ #include <linux/dma-buf.h>
+ #include <linux/version.h>
+ #ifdef ANDROID
+--
+1.9.1
+
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.7.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb
similarity index 66%
rename from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.7.0.bb
rename to recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb
index da2ac51..243f1f3 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.7.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb
@@ -2,9 +2,10 @@

DESCRIPTION = "i.MX Hantro VPU library"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db"

DEPENDS = "virtual/kernel"
+do_configure[depends] += "virtual/kernel:do_shared_workdir"

PROVIDES = "virtual/imxvpu"

@@ -12,13 +13,14 @@ SRC_URI = " \
${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
file://0001-Fix-ion.h-header-inclusion-to-be-standard.patch \
"
-SRC_URI[md5sum] = "9a8ade25333e6ac3f7c345b71f3477a6"
-SRC_URI[sha256sum] = "a3bbf2d8ac00ecae6d48b05cb94d9bdf68085d5bfc54eb176e3bf59670a87ad1"
+SRC_URI[md5sum] = "140796ddd6f1be47cffb7e5e2bfe0fb6"
+SRC_URI[sha256sum] = "c092a5b0f8897bae54154f58e47b6d2de033da01ee231a8cd779a51bbe962606"

inherit fsl-eula-unpack

PARALLEL_MAKE="-j 1"

+PLATFORM_mx8mm = "IMX8MM"
PLATFORM_mx8mq = "IMX8MQ"

do_compile () {
@@ -32,4 +34,4 @@ do_install () {
FILES_${PN} += "/unit_tests"

PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx8mq)"
+COMPATIBLE_MACHINE = "(mx8mq|mx8mm)"

[Yuqing Zhu]

Add support for i.MX8MMEVK
Update EULA to V26

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
.../imx-vpuwrap/{imx-vpuwrap_4.4.0.bb => imx-vpuwrap_4.4.2.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename recipes-multimedia/imx-vpuwrap/{imx-vpuwrap_4.4.0.bb => imx-vpuwrap_4.4.2.bb} (73%)

diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.4.0.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.4.2.bb
similarity index 73%
rename from recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.4.0.bb
rename to recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.4.2.bb
index eeb3e54..f6d8be9 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.4.0.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.4.2.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Freescale Multimedia VPU wrapper"
DEPENDS = "virtual/imxvpu"
LICENSE = "Proprietary"
SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db"

# For backwards compatibility
PROVIDES += "libfslvpuwrap"
@@ -16,8 +16,8 @@ RCONFLICTS_${PN} = "libfslvpuwrap"

SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"

-SRC_URI[md5sum] = "dc69b4df71bca964cccb19a9b46de591"
-SRC_URI[sha256sum] = "5adb17386584bdd39faa5004b4ceb83987f1519acf4466e15b42672def66f49d"
+SRC_URI[md5sum] = "86d1829ef62ab51e187479bfea686874"
+SRC_URI[sha256sum] = "85f01ebdf55e4bd7a7cc21eb5203dfcaa7b663f03ecdb8d5e54fbb995e3dc761"

inherit fsl-eula-unpack autotools pkgconfig

@@ -29,4 +29,4 @@ do_install_append() {
INSANE_SKIP_imx-vpuwrap = "file-rdeps"

PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx8mq)"
+COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx8mq|mx8mm)"

[Yuqing Zhu]

Update EULA to V26

Bugfix:
Fix last PES not processed by ts parser
Make H264 parser reset correctly when seeking

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
.../imx-parser/{imx-parser_4.4.0.bb => imx-parser_4.4.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename recipes-multimedia/imx-parser/{imx-parser_4.4.0.bb => imx-parser_4.4.2.bb} (88%)

diff --git a/recipes-multimedia/imx-parser/imx-parser_4.4.0.bb b/recipes-multimedia/imx-parser/imx-parser_4.4.2.bb
similarity index 88%
rename from recipes-multimedia/imx-parser/imx-parser_4.4.0.bb
rename to recipes-multimedia/imx-parser/imx-parser_4.4.2.bb
index 48e6282..492ab89 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.4.0.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.4.2.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "Freescale Multimedia parser libs"
LICENSE = "Proprietary"
SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db"

# For backwards compatibility
PROVIDES += "libfslparser"
@@ -14,8 +14,8 @@ RPROVIDES_${PN} = "libfslparser"
RCONFLICTS_${PN} = "libfslparser"

SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "55918adc721057ad762f39cada22c566"
-SRC_URI[sha256sum] = "edde3d1a0e52fce55f7b0df6bd831649434e71e434468cf8b247acc809c35e7a"
+SRC_URI[md5sum] = "0e425e143900f980c6fe7f735a679829"
+SRC_URI[sha256sum] = "21d1066dcdc6f0eb7efc56910ee9b116883456a013837506a0632153baedcbf3"

inherit fsl-eula-unpack autotools pkgconfig

[Yuqing Zhu]

Update EULA to V26

Enable vpu encoder 8MM

Enalbed date_time in 8MM
1. Refine date time overlay code
2. Use SW compositor in 8MM

Enalbe grecorder in imx8mm
1. Update video source and sink to autovideo source/sink
2. Added VP8 encoding format
3. Change audio recoder to mp1 layer2 to use opensource encoder
4. Remove videodetect with compiling macro
5. Update grecorder command option

Add support for disable audio in recording

Fix ion.h header inclusion to be standard

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
...plugin-Fix-ion.h-header-inclusion-to-be-s.patch | 44 ++++++++++++++++++++++
...-plugin_4.4.0.bb => imx-gst1.0-plugin_4.4.2.bb} | 10 +++--
2 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch
rename recipes-multimedia/gstreamer/{imx-gst1.0-plugin_4.4.0.bb => imx-gst1.0-plugin_4.4.2.bb} (91%)

diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch
new file mode 100644
index 0000000..4e861a5
--- /dev/null
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch
@@ -0,0 +1,44 @@
+From e4c96421700ecd008814bceceaf03f0ee9323c02 Mon Sep 17 00:00:00 2001
+From: Yuqing Zhu <***@nxp.com>
+Date: Thu, 27 Sep 2018 16:00:55 +0800
+Subject: [PATCH] imx-gst1.0-plugin: Fix ion.h header inclusion to be standard
+
+NXP "solution" was to manually copy the header to include/linux.
+Let's point the Makefile to the proper (mainline) location instead:
+https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h
+
+Signed-off-by: Yuqing Zhu <***@nxp.com>
+---
+ configure.ac | 2 +-
+ libs/gstimxcommon.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b2709d..d94e3a8 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,7 +216,7 @@ dnl check ion allocator headfile
+ old_CFLAGS=$CFLAGS
+ PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= 1.14, CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gstreamer-allocators-1.0`",\
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gstreamer-bad-allocators-1.0`")
+-AC_CHECK_HEADERS([linux/ion.h gst/allocators/gstionmemory.h], HAVE_ION="yes", HAVE_ION="no")
++AC_CHECK_HEADERS([ion.h gst/allocators/gstionmemory.h], HAVE_ION="yes", HAVE_ION="no")
+ AM_CONDITIONAL(USE_ION, test "x$HAVE_ION" = "xyes")
+ CFLAGS=$old_CFLAGS
+
+diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c
+index eb808b9..c02ab5f 100644
+--- a/libs/gstimxcommon.c
++++ b/libs/gstimxcommon.c
+@@ -26,7 +26,7 @@
+ #include <linux/version.h>
+ #include <linux/dma-buf.h>
+ #ifdef USE_ION
+-#include <linux/ion.h>
++#include <ion.h>
+ #endif
+ const char *dev_ion = "/dev/ion";
+
+--
+1.9.1
+
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.0.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb
similarity index 91%
rename from recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.0.bb
rename to recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb
index 00182bb..07a52c6 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.0.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb
@@ -21,10 +21,12 @@ 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.04.00_1805_L4.9.88_MX8QXP_BETA2"
+SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA"

-SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}"
-SRCREV = "ded3b04018ca71306da9bc38b0037b9ea99abd29"
+SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH} \
+ file://0001-imx-gst1.0-plugin-Fix-ion.h-header-inclusion-to-be-s.patch \
+"
+SRCREV = "23dd0315c7087e1c8eba836b9a458d7906187c7e"

S = "${WORKDIR}/git"

@@ -44,7 +46,7 @@ PLATFORM_mx8 = "MX8"

# Todo add a mechanism to map possible build targets
EXTRA_OECONF = "PLATFORM=${PLATFORM} \
- CPPFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated/uapi -I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" \
+ CPPFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated/uapi -I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include -I${STAGING_KERNEL_DIR}/drivers/staging/android/uapi" \
CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', bb.utils.contains('DISTRO_FEATURES', 'x11', '--disable-x11', '', d), '', d)}"

[Yuqing Zhu]

Update EULA to V26

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
.../imx-codec/{imx-codec_4.4.0.bb => imx-codec_4.4.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename recipes-multimedia/imx-codec/{imx-codec_4.4.0.bb => imx-codec_4.4.2.bb} (95%)

diff --git a/recipes-multimedia/imx-codec/imx-codec_4.4.0.bb b/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
similarity index 95%
rename from recipes-multimedia/imx-codec/imx-codec_4.4.0.bb
rename to recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
index 7879ff9..60a3717 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.4.0.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
@@ -5,14 +5,14 @@
DESCRIPTION = "Freescale Multimedia codec libs"
LICENSE = "Proprietary"
SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db"

# Backward compatibility
PROVIDES += "libfslcodec"

SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "27c4d8f70a2c9ee0c63034f97752c235"
-SRC_URI[sha256sum] = "6f0117365e0b0235ba42fc8b1bbbc5e02e635da47aff66face5816721b581fbf"
+SRC_URI[md5sum] = "6087fbac97002b7d8c5dd061e6b36417"
+SRC_URI[sha256sum] = "f225968d8efcdb8f1843adae162360df04166e91acea2c32388cf699f410bdda"

inherit fsl-eula-unpack autotools pkgconfig

[Yuqing Zhu]

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb
index a901223..30a6c03 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \

# Use i.MX fork of GST for customizations
GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.04.00_1805_L4.9.88_MX8QXP_BETA2"
+SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA"

SRC_URI = " \
${GST1.0_SRC};branch=${SRCBRANCH} \

[Yuqing Zhu]

Add i.MX8MM feature list accoridng to soc_id

Add marcos for i.MX8MM chip code in gstimxcommon

Respect to downstream format priority in glupload

Fix ion.h header inclusion to be standard

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
...0-plugins-base-Fix-ion.h-header-inclusion.patch | 45 ++++++++++++++++++++++
.../gstreamer1.0-plugins-base_1.14.imx.bb | 10 ++++-
2 files changed, 53 insertions(+), 2 deletions(-)
create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch
new file mode 100644
index 0000000..d3822cf
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch
@@ -0,0 +1,45 @@
+From 84f693a70e6f3084ca67063a6336aaf3287abb49 Mon Sep 17 00:00:00 2001
+From: Yuqing Zhu <***@nxp.com>
+Date: Thu, 27 Sep 2018 13:53:49 +0800
+Subject: [PATCH] gstreamer1.0-plugins-base: Fix ion.h header inclusion to be
+ standard
+
+NXP "solution" was to manually copy the header to include/linux.
+Let's point the Makefile to the proper (mainline) location instead:
+https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h
+
+Signed-off-by: Yuqing Zhu <***@nxp.com>
+---
+ configure.ac | 2 +-
+ gst-libs/gst/allocators/gstionmemory.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 51272df..4bea0dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -678,7 +678,7 @@ AG_GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [
+ dnl check for ion
+ translit(dnm, m, l) AM_CONDITIONAL(USE_ION, true)
+ AG_GST_CHECK_FEATURE(ION, [ion], ion, [
+- AC_CHECK_HEADER(linux/ion.h, HAVE_ION="yes", HAVE_ION="no")
++ AC_CHECK_HEADER(ion.h, HAVE_ION="yes", HAVE_ION="no")
+ ])
+
+ dnl FIXME : add second check somehow if that is necessary
+diff --git a/gst-libs/gst/allocators/gstionmemory.c b/gst-libs/gst/allocators/gstionmemory.c
+index 5e0455c..a285f09 100644
+--- a/gst-libs/gst/allocators/gstionmemory.c
++++ b/gst-libs/gst/allocators/gstionmemory.c
+@@ -26,7 +26,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/types.h>
+-#include <linux/ion.h>
++#include <ion.h>
+ #include <linux/dma-buf.h>
+ #include <linux/version.h>
+
+--
+1.9.1
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb
index 3ea3d57..3d31d22 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.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.04.00_1805_L4.9.88_MX8QXP_BETA2"
+SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA"

SRC_URI = " \
${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
@@ -16,8 +16,9 @@ SRC_URI = " \
file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
file://0003-riff-add-missing-include-directories-when-calling-in.patch \
file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
+ file://0001-gstreamer1.0-plugins-base-Fix-ion.h-header-inclusion.patch \
"
-SRCREV = "04bafd740a52757f12496206cfabe282835a1eb5"
+SRCREV = "e1f90437939b147658efed4d86c3f99d5e606968"

DEFAULT_PREFERENCE = "-1"

@@ -62,6 +63,11 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"

EXTRA_OECONF += " \
--enable-zlib \
+ CPPFLAGS=" \
+ -I${STAGING_KERNEL_DIR}/include/uapi \
+ -I${STAGING_KERNEL_DIR}/include \
+ -I${STAGING_KERNEL_DIR}/drivers/staging/android/uapi \
+ " \
"

CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"

[Yuqing Zhu]

Changes for waylandsink:
Implement alpha blending for surface
Support HDR10 video playback
Set to play video fullscreen as default
Set waylandsink as default video sink for imx8
Add property to set window resolution
Add internal dmabuf pool to support SW decode

Signed-off-by: Yuqing Zhu <***@nxp.com>
---
recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb
index f35c825..2e3f346 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF_append = " --disable-introspection"


GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.04.00_1805_L4.9.88_MX8QXP_BETA2"
+SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA"

SRC_URI = " \
${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \
@@ -26,7 +26,7 @@ SRC_URI = " \
file://0001-opencv-fix-build-for-opencv-3-4-2.patch \
"

-SRCREV = "07ad0bb676a16c2dffb0f0e415a873f0924cfdc0"
+SRCREV = "03e6ef6a371a0578a9629abde8e9c83e66f34b11"

DEFAULT_PREFERENCE = "-1"