From 89d5d5ff44395b93da3a1b6025f24e2897ca33bb Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 18 Dec 2014 16:48:15 -0200
Subject: u-boot-fslc: Update to 2015.01-rc3 based version

This uses revision 5d396c3 which includes the 2015.01-rc3 development
version with following changes on top of it:

5d396c3 wandboard: Changed mmcroot variable so kernel 3.10.31 boots
c6d9bf7 iMX6: Change mmcroot to use fixed mmc block index for USDHC
be9a741 embestmx6boards: Change default bootenv configuration
ea9b369 wandboard: Use 32bit color depth for Fusion LCD
8e88da8 mx6sabresd: Use LDO dtb file until LDO bypass support is added
7d0f155 mx6slevk: Use LDO dtb file until LDO bypass support is added
dcd7ac3 mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT

The repository URL has also been changed to point to the new Git
repository name (u-boot-fslc), however the previous repository is
still accessible to avoid breakage in old versions of meta-fsl-arm.

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

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb
deleted file mode 100644
index c694090..0000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "U-boot bootloader mxsboot tool"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
-SECTION = "bootloader"
-DEPENDS = "openssl"
-PROVIDES = "u-boot-mxsboot"
-
-PV = "v2014.10+git${SRCPV}"
-
-SRCREV = "5fd0b607d0ef44b8b93d64faace674955791dd7d"
-SRCBRANCH = "patches-2014.10"
-SRC_URI = "git://github.com/Freescale/u-boot-imx.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.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.01.bb
new file mode 100644
index 0000000..732449b
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.01.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "U-boot bootloader mxsboot tool"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
+SECTION = "bootloader"
+DEPENDS = "openssl"
+PROVIDES = "u-boot-mxsboot"
+
+PV = "v2015.01+git${SRCPV}"
+
+SRCREV = "5d396c3283bdfa44b3c2d811a72344f6e200156d"
+SRCBRANCH = "patches-2015.01"
+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 19e2f98..83a76c0 100644
--- a/recipes-bsp/u-boot/u-boot-fslc.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -19,7 +19,7 @@ PROVIDES += "u-boot"
 
 SRCBRANCH ??= "master"
 
-SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb
deleted file mode 100644
index 6b023bf..0000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2014.10+git${SRCPV}"
-
-SRCREV = "e3517cb1c240aef2ddcc6565937178609b8a8bda"
-SRCBRANCH = "patches-2014.10"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.01.bb
new file mode 100644
index 0000000..e814e55
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2015.01.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2015.01+git${SRCPV}"
+
+SRCREV = "5d396c3283bdfa44b3c2d811a72344f6e200156d"
+SRCBRANCH = "patches-2015.01"
-- 
cgit v1.2.3-54-g00ecf