[meta-freescale] [meta-fsl-arm][PATCH 2/4] u-boot-fslc: Upgrade to a 2015.07-based fork

[Otavio Salvador]

This upgrades the FSL Community fork to a 2015.07-based one. The
following patches are applied on top of the original source code:

31851bd wandboard: Drop revision specific DeviceTree support
a31d74b mx6sabresd: Enable video interfaces in bootargs
9aaf17f Revert "embestmx6boards: convert to use config_distro_bootcmd.h"
05c69ef wandboard: Changed mmcroot variable so kernel 3.10.31 boots
3e86dfb iMX6: Change mmcroot to use fixed mmc block index for USDHC
44ffc6d mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT
7767edb embestmx6boards: Change default bootenv configuration
bebd6c7 mx6sabresd: Use LDO dtb file until LDO bypass support is added
8a82d9d mx6slevk: Use LDO dtb file until LDO bypass support is added
6f3f04e thermal: imx_thermal: fix busywait if IMX6 temp <0C
a978050 tools: mkimage: fix imximage header size
8788cb7 i2c: fix vf610 support
a7fd9dd net: fec_mxc: remove useless struct nbuf
823ba31 iMX: adding parsing to hab_status command
0210211 imx: mx6 add i2c4 clock support for i.MX6SX
8e45722 imx: mx6 remove duplicated enable_cspi_clock
bf639dd imx6: standardise OCOTP and fuse config to mx6_common
4d4c88c thermal:imx_thermal: enter busywait cooling loop when over max CPU temp
c23cd60 mx53loco: Use generic 'load' command instead of 'fatload'

Change-Id: I7215c00328e6110fb40effa0514a28d076bbedf0
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
 ...oot-fslc-mxsboot_2015.04.bb => u-boot-fslc-mxsboot_2015.07.bb} | 8 ++++----
 recipes-bsp/u-boot/u-boot-fslc.inc                                | 4 ++--
 recipes-bsp/u-boot/u-boot-fslc_2015.04.bb                         | 6 ------
 recipes-bsp/u-boot/u-boot-fslc_2015.07.bb                         | 6 ++++++
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2015.04.bb => u-boot-fslc-mxsboot_2015.07.bb} (78%)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2015.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2015.07.bb

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
similarity index 78%
rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb
rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
index 3981b60..bf71b27 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
@@ -1,14 +1,14 @@
 DESCRIPTION = "U-boot bootloader mxsboot tool"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
 SECTION = "bootloader"
 DEPENDS = "openssl"
 PROVIDES = "u-boot-mxsboot"
 
-PV = "v2015.04+git${SRCPV}"
+PV = "v2015.07+git${SRCPV}"
 
-SRCREV = "10aced37cecf117e54e71bd700228f57dc34e579"
-SRCBRANCH = "patches-2015.04"
+SRCREV = "31851bd6bd527b1c9275ea9597594f382779c679"
+SRCBRANCH = "2015.07+fslc"
 
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc
index a9b35a6..5f297b9 100644
--- a/recipes-bsp/u-boot/u-boot-fslc.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2015 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 require recipes-bsp/u-boot/u-boot.inc
@@ -10,7 +10,7 @@ order to provide support for some backported features and fixes, or because it \
 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=c7383a594871c03da76b3707929d2919"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)"
 
 DEPENDS_mxs += "elftosb-native openssl-native"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb
deleted file mode 100644
index aeefc5a..0000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2015.04+git${SRCPV}"
-
-SRCREV = "5d9ffd22149119c0acfd31efb8c4d40afca7ce6f"
-SRCBRANCH = "patches-2015.04"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
new file mode 100644
index 0000000..b498ba9
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2015.07+git${SRCPV}"
+
+SRCREV = "31851bd6bd527b1c9275ea9597594f382779c679"
+SRCBRANCH = "2015.07+fslc"
-- 
2.4.5