From 67055b634e332424a09e46f51027d8174cacd4cd Mon Sep 17 00:00:00 2001
From: Daiane Angolini <daiane.angolini@freescale.com>
Date: Wed, 6 Jun 2012 09:00:39 -0500
Subject: [PATCH] imx-lib: Move code to .inc file

Add imx-lib.inc to avoid duplication of code if a new imx-lib release
was included.

Change LICENSE field to LGPLv2.1.

Include PLATFORM variable to make easier to include a new platform.

Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---
 .../fsl-mm-core/imx-lib.inc                   | 33 +++++++++++++++++
 .../fsl-mm-core/imx-lib_11.09.01.bb           | 37 +++----------------
 2 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib.inc

diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib.inc b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib.inc
new file mode 100644
index 00000000..52e25d06
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib.inc
@@ -0,0 +1,33 @@
+# Copyright (C) 2012 Freescale Semiconductor
+
+DESCRIPTION = "Platform specific libraries for imx platform"
+LICENSE = "LGPLv2.1"
+SECTION = "multimedia"
+DEPENDS = "virtual/kernel"
+
+INC_PR = "r1"
+
+LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
+
+SRC_URI = "file://${PN}-${PV}.tar.gz"
+
+PLATFORM_mx5 = "IMX51"
+
+PARALLEL_MAKE="-j 1"
+EXTRA_OEMAKE = ""
+
+do_compile () {
+    INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
+                 -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include \
+                 -I${STAGING_KERNEL_DIR}/include"
+    oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all
+}
+
+do_install () {
+    oe_runmake DEST_DIR="${D}" install
+}
+
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_${PN}-dev += "${libdir}/*.la ${libdir}/*.a"
+
diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
index a1b137a8..843c1a7b 100644
--- a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
+++ b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
@@ -1,36 +1,11 @@
-# Copyright (C) 2011 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
+include imx-lib.inc
 
-DESCRIPTION = "Platform specific libraries for imx platform"
-LICENSE = "LGPL"
-SECTION = "multimedia"
-DEPENDS = "virtual/kernel"
-PR = "r1"
+PR = "${INC_PR}.0"
 
-LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
+COMPATIBLE_MACHINE = "(mx5)"
 
-SRC_URI = "file://${PN}-${PV}.tar.gz \
-           file://imx-lib-remove-shared-libs-symlinks.patch \
-           file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
-           file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch"
+SRC_URI += " file://imx-lib-remove-shared-libs-symlinks.patch \
+             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"
-
-# override parallel make flags
-PARALLEL_MAKE="-j 1"
-EXTRA_OEMAKE = ""
-
-do_compile () {
-    INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
-                 -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include \
-                 -I${STAGING_KERNEL_DIR}/include"
-    oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="IMX51" INCLUDE="${INCLUDE_DIR}" all
-}
-
-do_install () {
-    oe_runmake DEST_DIR="${D}" install
-}
-
-FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dbg += "${libdir}/.debug"
-FILES_${PN}-dev += "${libdir}/*.la ${libdir}/*.a"
-- 
2.40.1