From 975926a0667d5ad0737b45b9947c3390034f2965 Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Thu, 4 Sep 2014 08:12:56 -0500 Subject: [PATCH] imx-lib: Upgrade to 3.10.31-1.1.0 Beta version Makefiles changed for mx6sx and mx6sl to exclude rng and sahara since those are not supported on mx6 chips. Platform is set to MX6S for both mx6sx and mx6sl so the previous makefiles only excluded MX6Q platform. Note this is different for imx-test which specifies MX6SX and MX6SL in makefiles. In imx-lib they are treated the same. Add PLATFORM setting for mx6sx and mx6sl imx-lib has pxp libraries only used for mx6sx and mx6sl Previously used MX6Q but mx6q and mx6dl can't be built with pxp Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- .../obey-variables.patch | 0 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc | 2 ++ .../recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb | 11 ----------- .../recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 11 deletions(-) rename meta-fsl-arm/recipes-bsp/imx-lib/{imx-lib-3.10.17-1.0.0 => imx-lib-3.10.31-1.1.0}/obey-variables.patch (100%) delete mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb create mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.17-1.0.0/obey-variables.patch b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.31-1.1.0/obey-variables.patch similarity index 100% rename from meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.17-1.0.0/obey-variables.patch rename to meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.31-1.1.0/obey-variables.patch diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc index 243eb886..314e153b 100644 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc +++ b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b18 PLATFORM_mx6 = "IMX6Q" PLATFORM_mx5 = "IMX51" +PLATFORM_mx6sl = "IMX6S" +PLATFORM_mx6sx = "IMX6S" PARALLEL_MAKE="-j 1" EXTRA_OEMAKE = "" diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb deleted file mode 100644 index 212ec3fb..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.17-1.0.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2013, 2014 Freescale Semiconductor - -include imx-lib.inc - -PE = "1" - -SRC_URI += "file://obey-variables.patch" -SRC_URI[md5sum] = "8e3346d5f33b5aa5f915a0dd8aa99cc9" -SRC_URI[sha256sum] = "f42605971977e5fe1ed9e7ce17ea3f97586a23fbc60fa0f679940d379c72303e" - -COMPATIBLE_MACHINE = "(mx6)" diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb new file mode 100644 index 00000000..a8e44be6 --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb @@ -0,0 +1,16 @@ +# Copyright (C) 2013, 2014 Freescale Semiconductor + +include imx-lib.inc + +# FIXME: Drop 'beta' suffix for GA release +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.tar.gz" +S = "${WORKDIR}/${PN}-${PV}-beta" + +SRC_URI += "file://obey-variables.patch" + +PE = "1" + +SRC_URI[md5sum] = "0485e457eafe5a10274d171b3af79e2f" +SRC_URI[sha256sum] = "011eb34c6fd1b1ea9894bbe07a539c1aeee1500bc8fdd29d8ce1dc1d02f79e24" + +COMPATIBLE_MACHINE = "(mx6)" -- 2.40.1