From dcae3cd1d0eb4b10ba9dbff50bee337ad6856930 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 26 Sep 2013 09:31:23 -0300 Subject: [PATCH] imx-lib: Move from 11.09.01 to 11.09.02 The lib-vpu must be remove from imx-lib package due to a license conflict. Beside that a list of patches was included over 11.09.01: * ENGR00277379 yocto: Makefile changes to build on Yocto * ENGR00272020 Add EULA.txt to VPU lib directory * ENGR00215182 HDMI CEC:Add Makefile of hdmi-cec lib * ENGR00234665 Enable pxp library building * ENGR00230334: Fix for GCC 4.6 toolchain and build warnings * ENGR00221837-2 ipu lib: only build for i.MX5 platform * ENGR00179726-2 Add VDOA V4L support to VPU unit test * ENGR00177165: Fix build error of missing videodev.h * ENGR00174611: Configured ePxP lib for MX6 * ENGR00170744 IPU lib:Control interface supports allocating pmem buf * ENGR00170632 IPU lib:Allocate pmem buf for rotation buf * ENGR00170455 IPU lib:Change head file for flash Change-Id: I034f22535d78edfce08519eead0310b2a8b4e4a0 Signed-off-by: Daiane Angolini --- ...-Fix-decoding-mp4PackedPBFrame-strea.patch | 31 ---------------- ...-Fix-the-issue-of-rotation-180-degre.patch | 36 ------------------- .../recipes-bsp/imx-lib/imx-lib_11.09.01.bb | 12 ------- .../recipes-bsp/imx-lib/imx-lib_11.09.02.bb | 8 +++++ 4 files changed, 8 insertions(+), 79 deletions(-) delete mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch delete mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch delete mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.01.bb create mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch deleted file mode 100644 index 4fa3d8be..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3bca9e128dd82e69f877e90c1bcd614c48a75161 Mon Sep 17 00:00:00 2001 -From: Sammy He -Date: Thu, 15 Sep 2011 22:40:10 +0800 -Subject: [PATCH 1/3] ENGR00156800 vpu: Fix decoding mp4PackedPBFrame stream failure issue - -Decoding the stream with mp4PackedPBFrame is failure due to write -point in bitstream set wrong. -This patch will fix it. - -Signed-off-by: Sammy He ---- - vpu/vpu_lib.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c -index a5522fa..32d44b2 100644 ---- a/vpu/vpu_lib.c -+++ b/vpu/vpu_lib.c -@@ -3552,6 +3552,9 @@ RetCode vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info) - info->notSufficientSliceBuffer = (val >> 2) & 0x1; - } else if (pCodecInst->codecMode == MP4_DEC) { - info->mp4PackedPBframe = ((val >> 16) & 0x01); -+ /* Need to backup WR_PTR for mp4PackedPBframe */ -+ if (info->mp4PackedPBframe) -+ pCodecInst->ctxRegs[CTX_BIT_WR_PTR] = VpuReadReg(BIT_WR_PTR); - } - - val = VpuReadReg(RET_DEC_PIC_SIZE); /* decoding picture size */ --- -1.7.1 - diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch deleted file mode 100644 index 1183b29d..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-11.09.01/0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 57e5a741c5bef4ac5afd820979a93808ecc97c64 Mon Sep 17 00:00:00 2001 -From: Sammy He -Date: Mon, 21 Nov 2011 23:08:18 +0800 -Subject: [PATCH 2/3] ENGR00162690 vpu: Fix the issue of rotation 180 degree in encoder - -There may be mosaic if rotation is 180 degree in vpu encoder on mx5. -This patch fixed it, same solution is applied to mx6 platform. - -Signed-off-by: Sammy He ---- - vpu/vpu_lib.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c -index 32d44b2..0fcf5d5 100644 ---- a/vpu/vpu_lib.c -+++ b/vpu/vpu_lib.c -@@ -1306,7 +1306,6 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) - return RETCODE_FAILURE_TIMEOUT; - - if (pEncInfo->rotationEnable) { -- rotMirEnable = 0x10; /* Enable rotator */ - switch (pEncInfo->rotationAngle) { - case 0: - rotMirMode |= 0x0; -@@ -1326,7 +1325,6 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) - } - } - if (pEncInfo->mirrorEnable) { -- rotMirEnable = 0x10; /* Enable mirror */ - switch (pEncInfo->mirrorDirection) { - case MIRDIR_NONE: - rotMirMode |= 0x0; --- -1.7.1 - diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.01.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.01.bb deleted file mode 100644 index 37e66281..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.01.bb +++ /dev/null @@ -1,12 +0,0 @@ -include imx-lib.inc - -PR = "r5.2" - -SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz" - -SRC_URI += " file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \ - file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch" -SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c" -SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27" - -COMPATIBLE_MACHINE = "(mx5)" diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb new file mode 100644 index 00000000..07c6e350 --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_11.09.02.bb @@ -0,0 +1,8 @@ +# Copyright (C) 2013 Freescale Semiconductor +require imx-lib.inc + +SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz" +SRC_URI[md5sum] = "a4e7447e35cfac0b966a51f001390d6e" +SRC_URI[sha256sum] = "3ed082005789db0c9c41e14073417319f4e23f5646a7d21f34840470f4328bd5" + +COMPATIBLE_MACHINE = "(mx5)" -- 2.40.1