From 48a50943917424d64c8be5ae48eccb1781fcec3e Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 16 Sep 2015 16:04:31 -0300
Subject: u-boot-fslc: Update to 2015.10-based fork

This updates the fork based on upcoming 2015.10 release. This is
currently based on 2015.10-rc3 tag and offers a very solid release for
start the tests for Yocto Project 2.0 release.

Change-Id: I1d35409a9806a96f8dd538e2b8c2a3520e9104ba
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb | 35 -----------------------
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb | 35 +++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc.inc                |  2 +-
 recipes-bsp/u-boot/u-boot-fslc_2015.07.bb         |  6 ----
 recipes-bsp/u-boot/u-boot-fslc_2015.10.bb         |  6 ++++
 5 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2015.10.bb

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
deleted file mode 100644
index 134d0f9..0000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "U-boot bootloader mxsboot tool"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
-SECTION = "bootloader"
-DEPENDS = "openssl"
-PROVIDES = "u-boot-mxsboot"
-
-PV = "v2015.07+git${SRCPV}"
-
-SRCREV = "3f0c5353f93b5e9c4d57c9f3886ad4cd78c38a81"
-SRCBRANCH = "2015.07+fslc"
-
-SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
-
-S = "${WORKDIR}/git"
-
-inherit fsl-u-boot-localversion
-
-EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y'
-
-do_configure () {
-    oe_runmake sandbox_defconfig
-}
-
-do_compile () {
-    oe_runmake tools-only
-}
-
-do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot
-    ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb
new file mode 100644
index 0000000..3ea0d11
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "U-boot bootloader mxsboot tool"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+SECTION = "bootloader"
+DEPENDS = "openssl"
+PROVIDES = "u-boot-mxsboot"
+
+PV = "v2015.10+git${SRCPV}"
+
+SRCREV = "1fb68c8c84068372cae4adf2e726e2a4ba712655"
+SRCBRANCH = "2015.10+fslc"
+
+SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y'
+
+do_configure () {
+    oe_runmake sandbox_defconfig
+}
+
+do_compile () {
+    oe_runmake tools-only
+}
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot
+    ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc
index 5f297b9..df67469 100644
--- a/recipes-bsp/u-boot/u-boot-fslc.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -11,7 +11,7 @@ was submitted for revision and it takes some time to become part of a stable \
 version, or because it is not applicable for upstreaming."
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
-COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)"
+COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx6ul|mx7|vf)"
 
 DEPENDS_mxs += "elftosb-native openssl-native"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
deleted file mode 100644
index fbe3eb1..0000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2015.07+git${SRCPV}"
-
-SRCREV = "3f0c5353f93b5e9c4d57c9f3886ad4cd78c38a81"
-SRCBRANCH = "2015.07+fslc"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.10.bb
new file mode 100644
index 0000000..3c1812b
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2015.10.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2015.10+git${SRCPV}"
+
+SRCREV = "1fb68c8c84068372cae4adf2e726e2a4ba712655"
+SRCBRANCH = "2015.10+fslc"
-- 
cgit v1.2.3-54-g00ecf