4 files changed, 18 insertions, 11 deletions

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
index cc6319f79..cc6319f79 100644
--- 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
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 243eb8865..314e153bb 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 212ec3fbb..000000000
--- 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 000000000..a8e44be61
--- /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)"