[meta-freescale] [PATCH 2/4] imx-vpu: Upgrade to v5.4.37

[Jun Zhu]

- Add virtual/libvpu provides for the future VPUs on other SoC.
- Integrate the bug fixes.

Signed-off-by: Jun Zhu <***@nxp.com>
---
recipes-bsp/imx-vpu/imx-vpu.inc | 6 ++++++
recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb | 11 -----------
recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb | 19 +++++++++++++++++++
3 files changed, 25 insertions(+), 11 deletions(-)
delete mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb
create mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb

diff --git a/recipes-bsp/imx-vpu/imx-vpu.inc b/recipes-bsp/imx-vpu/imx-vpu.inc
index dc6c166..af528e8 100644
--- a/recipes-bsp/imx-vpu/imx-vpu.inc
+++ b/recipes-bsp/imx-vpu/imx-vpu.inc
@@ -1,9 +1,15 @@
# Copyright (C) 2013-2016 O.S. Systems Software LTDA.
# Copyright (C) 2013 Freescale Semiconductor
+# Copyright 2017 NXP
+
DESCRIPTION = "Freescale VPU library"
LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54"
DEPENDS = "virtual/kernel"
+
+PROVIDES = "virtual/libvpu"
+RPROVIDES_${PN} = "virtual/libvpu"
+
inherit fsl-eula-unpack

PLATFORM_mx6 = "IMX6Q"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb
deleted file mode 100644
index 2ff0036..0000000
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-
-require imx-vpu.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
-
-PE = "1"
-
-SRC_URI[md5sum] = "52c1ee80c11d3179715c932f3f3ae890"
-SRC_URI[sha256sum] = "e1d6550426dfc59e4fd0352f1d312ea7eff5dcf18974f923ed7a85007cb40e27"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
new file mode 100644
index 0000000..ff510e3
--- /dev/null
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
@@ -0,0 +1,19 @@
+# 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"
+
+# imx-vpu can only support imx6q platform, in order to build out the vpu case in unit test,
+# using a workaround to transfer "IMX6Q" on imx6ul & imx7d platform.
+#PLATFORM_mx6ul = "IMX6Q"
+#PLATFORM_mx7 = "IMX6Q"
+#LATFORM_mx6sll = "IMX6Q"
+
+#COMPATIBLE_MACHINE = "(mx6|mx7)"
+COMPATIBLE_MACHINE = "(mx6)"

[Jun Zhu]

- As the imx-lib git repository is public as git.freescale.com/imx/imx-lib.git,
build it from the git.
- Add support to i.MX 6SLL and 7ULP.

Add the options to support i.MX 6SLL and 7ULP

Signed-off-by: Jun Zhu <***@nxp.com>
---
recipes-bsp/imx-lib/imx-lib_5.4.bb | 10 ---------
.../imx-lib/{imx-lib.inc => imx-lib_git.bb} | 26 ++++++++++++++--------
2 files changed, 17 insertions(+), 19 deletions(-)
delete mode 100644 recipes-bsp/imx-lib/imx-lib_5.4.bb
rename recipes-bsp/imx-lib/{imx-lib.inc => imx-lib_git.bb} (57%)

diff --git a/recipes-bsp/imx-lib/imx-lib_5.4.bb b/recipes-bsp/imx-lib/imx-lib_5.4.bb
deleted file mode 100644
index 3055c51..0000000
--- a/recipes-bsp/imx-lib/imx-lib_5.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-
-include imx-lib.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "a0da6a01698776f2df05130108c226c9"
-SRC_URI[sha256sum] = "8d12c4a0a44d29569f1ead3a36adc28402b9c4036b53e11dd3ebf2295e3ce1d0"
-
-COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-bsp/imx-lib/imx-lib.inc b/recipes-bsp/imx-lib/imx-lib_git.bb
similarity index 57%
rename from recipes-bsp/imx-lib/imx-lib.inc
rename to recipes-bsp/imx-lib/imx-lib_git.bb
index 0b21d94..d878bde 100644
--- a/recipes-bsp/imx-lib/imx-lib.inc
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -1,33 +1,41 @@
-# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2016 Freescale Semiconductor
# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
+# Copyright 2017 NXP

DESCRIPTION = "Platform specific libraries for imx platform"
LICENSE = "LGPLv2.1"
SECTION = "multimedia"
DEPENDS = "virtual/kernel"

-LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
+LIC_FILES_CHKSUM = "file://${S}/COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
+
+PE = "1"
+
+SRCBRANCH = "imx_4.9.11_1.0.0_ga"
+SRC_URI = "git://git.freescale.com/imx/imx-lib.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "f5f14fc24581e5d6e689f42a56b5f2992f978ef4"
+
+S = "${WORKDIR}/git"

PLATFORM_mx6q = "IMX6Q"
PLATFORM_mx6dl = "IMX6Q"
PLATFORM_mx6sl = "IMX6S"
+PLATFORM_mx6sll = "IMX6UL"
PLATFORM_mx6sx = "IMX6S"
-PLATFORM_mx7d = "IMX7"
PLATFORM_mx6ul = "IMX6UL"
+PLATFORM_mx7d = "IMX7"
+PLATFORM_mx7ulp = "IMX7"

PARALLEL_MAKE="-j 1"
EXTRA_OEMAKE = ""

-SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
-
do_compile () {
- INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include \
- -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
- -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include"
-
+ INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"
oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all
}

do_install () {
oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install
}
+
+COMPATIBLE_MACHINE = "(mx6|mx7)"

[Otavio Salvador]

Post by Jun Zhu
- As the imx-lib git repository is public as git.freescale.com/imx/imx-lib.git,
build it from the git.
- Add support to i.MX 6SLL and 7ULP.
Add the options to support i.MX 6SLL and 7ULP
---
recipes-bsp/imx-lib/imx-lib_5.4.bb | 10 ---------
.../imx-lib/{imx-lib.inc => imx-lib_git.bb} | 26 ++++++++++++++--------
2 files changed, 17 insertions(+), 19 deletions(-)
delete mode 100644 recipes-bsp/imx-lib/imx-lib_5.4.bb
rename recipes-bsp/imx-lib/{imx-lib.inc => imx-lib_git.bb} (57%)
diff --git a/recipes-bsp/imx-lib/imx-lib_5.4.bb b/recipes-bsp/imx-lib/imx-lib_5.4.bb
deleted file mode 100644
index 3055c51..0000000
--- a/recipes-bsp/imx-lib/imx-lib_5.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-
-include imx-lib.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "a0da6a01698776f2df05130108c226c9"
-SRC_URI[sha256sum] = "8d12c4a0a44d29569f1ead3a36adc28402b9c4036b53e11dd3ebf2295e3ce1d0"
-
-COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-bsp/imx-lib/imx-lib.inc b/recipes-bsp/imx-lib/imx-lib_git.bb
similarity index 57%
rename from recipes-bsp/imx-lib/imx-lib.inc
rename to recipes-bsp/imx-lib/imx-lib_git.bb
index 0b21d94..d878bde 100644
--- a/recipes-bsp/imx-lib/imx-lib.inc
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -1,33 +1,41 @@
-# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2016 Freescale Semiconductor
# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
+# Copyright 2017 NXP
DESCRIPTION = "Platform specific libraries for imx platform"
LICENSE = "LGPLv2.1"
SECTION = "multimedia"
DEPENDS = "virtual/kernel"
-LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
+LIC_FILES_CHKSUM = "file://${S}/COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
+

...

Not right.

Post by Jun Zhu
+PE = "1"
+
+SRCBRANCH = "imx_4.9.11_1.0.0_ga"
+SRC_URI = "git://git.freescale.com/imx/imx-lib.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "f5f14fc24581e5d6e689f42a56b5f2992f978ef4"
+
+S = "${WORKDIR}/git"
PLATFORM_mx6q = "IMX6Q"
PLATFORM_mx6dl = "IMX6Q"
PLATFORM_mx6sl = "IMX6S"
+PLATFORM_mx6sll = "IMX6UL"
PLATFORM_mx6sx = "IMX6S"
-PLATFORM_mx7d = "IMX7"
PLATFORM_mx6ul = "IMX6UL"
+PLATFORM_mx7d = "IMX7"
+PLATFORM_mx7ulp = "IMX7"
PARALLEL_MAKE="-j 1"
EXTRA_OEMAKE = ""
-SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
-
do_compile () {
- INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include \
- -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
- -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include"
-
+ INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"
oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all
}
do_install () {
oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install
}
+
+COMPATIBLE_MACHINE = "(mx6|mx7)"
--
2.7.4
--
_______________________________________________
meta-freescale mailing list
https://lists.yoctoproject.org/listinfo/meta-freescale

...

[Jun Zhu]

In order to support future VPUs on other SoC, replace imx-vpu
with virtual/libvpu.

Signed-off-by: Jun Zhu <***@nxp.com>
---
recipes-multimedia/imx-vpuwrap/imx-vpuwrap_1.0.68.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_1.0.68.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_1.0.68.bb
index 56b5b0a..f13c67b 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_1.0.68.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_1.0.68.bb
@@ -1,7 +1,8 @@
# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2017 NXP
# Released under the MIT license (see COPYING.MIT for the terms)
DESCRIPTION = "Freescale Multimedia VPU wrapper"
-DEPENDS = "imx-vpu"
+DEPENDS = "virtual/libvpu"
LICENSE = "Proprietary"
SECTION = "multimedia"
LIC_FILES_CHKSUM = "file://COPYING;md5=d4f548f93b5fe0ee2bc86758c344412d"

[Jun Zhu]

- As imx-test git repository is public as git://git.freescale.com/imx/imx-test.git,
build it from git.
- Add support to i.MX 6SLL and 7ULP.
- Replace imx-vpu with virtual/libvpu.

Signed-off-by: Jun Zhu <***@nxp.com>
---
recipes-bsp/imx-test/imx-test.inc | 14 +++++++++-----
recipes-bsp/imx-test/imx-test_git.bb | 14 ++++++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 recipes-bsp/imx-test/imx-test_git.bb

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index ce24860..d01e7e5 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -1,23 +1,25 @@
# 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 imx-vpu"
-DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu"
+
+DEPENDS_mx6q = "virtual/kernel imx-lib virtual/libvpu"
+DEPENDS_mx6dl = "virtual/kernel imx-lib virtual/libvpu"
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"

-SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz"
-
inherit module-base

INHIBIT_PACKAGE_STRIP = "1"
@@ -26,9 +28,11 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
PLATFORM_mx6q = "IMX6Q"
PLATFORM_mx6dl = "IMX6Q"
PLATFORM_mx6sl = "IMX6SL"
+PLATFORM_mx6sll = "IMX6SL"
PLATFORM_mx6sx = "IMX6SX"
-PLATFORM_mx7d = "IMX7D"
PLATFORM_mx6ul = "IMX6UL"
+PLATFORM_mx7d = "IMX7D"
+PLATFORM_mx7ulp = "IMX7D"

PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
new file mode 100644
index 0000000..528252e
--- /dev/null
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2017 NXP
+
+include imx-test.inc
+
+PARALLEL_MAKE="-j 1"
+
+SRCBRANCH = "imx_4.9.11_1.0.0_ga"
+SRC_URI = "git://git.freescale.com/imx/imx-test.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "fb250a795ce0d25c19610e9e19e1cd815fc64cb9"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = "(mx6|mx7)"

[Otavio Salvador]

Post by Jun Zhu
- Add virtual/libvpu provides for the future VPUs on other SoC.

Please use virtual/imx-vpu as this is not generally used.

Post by Jun Zhu
- Integrate the bug fixes.
---
recipes-bsp/imx-vpu/imx-vpu.inc | 6 ++++++
recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb | 11 -----------
recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb | 19 +++++++++++++++++++
3 files changed, 25 insertions(+), 11 deletions(-)
delete mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb
create mode 100644 recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
diff --git a/recipes-bsp/imx-vpu/imx-vpu.inc b/recipes-bsp/imx-vpu/imx-vpu.inc
index dc6c166..af528e8 100644
--- a/recipes-bsp/imx-vpu/imx-vpu.inc
+++ b/recipes-bsp/imx-vpu/imx-vpu.inc
@@ -1,9 +1,15 @@
# Copyright (C) 2013-2016 O.S. Systems Software LTDA.
# Copyright (C) 2013 Freescale Semiconductor
+# Copyright 2017 NXP
+
DESCRIPTION = "Freescale VPU library"
LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54"
DEPENDS = "virtual/kernel"
+
+PROVIDES = "virtual/libvpu"
+RPROVIDES_${PN} = "virtual/libvpu"

...

Not sure rprovides is need here; it is going to choose the VPU library
at build time so the runtime dependencies will be added by the build
system.

Post by Jun Zhu
+
inherit fsl-eula-unpack
PLATFORM_mx6 = "IMX6Q"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb
deleted file mode 100644
index 2ff0036..0000000
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.35.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-
-require imx-vpu.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
-
-PE = "1"
-
-SRC_URI[md5sum] = "52c1ee80c11d3179715c932f3f3ae890"
-SRC_URI[sha256sum] = "e1d6550426dfc59e4fd0352f1d312ea7eff5dcf18974f923ed7a85007cb40e27"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
new file mode 100644
index 0000000..ff510e3
--- /dev/null
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.37.bb
@@ -0,0 +1,19 @@
+# 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"
+
+# imx-vpu can only support imx6q platform, in order to build out the vpu case in unit test,
+# using a workaround to transfer "IMX6Q" on imx6ul & imx7d platform.
+#PLATFORM_mx6ul = "IMX6Q"
+#PLATFORM_mx7 = "IMX6Q"
+#LATFORM_mx6sll = "IMX6Q"
+
+#COMPATIBLE_MACHINE = "(mx6|mx7)"
+COMPATIBLE_MACHINE = "(mx6)"
--
2.7.4
--
_______________________________________________
meta-freescale mailing list
https://lists.yoctoproject.org/listinfo/meta-freescale

...