[meta-freescale] [meta-fsl-arm][PATCH v3 04/13] u-boot-ls1: update to revision v2015.01-630-g6ba8eed

[b28495 at freescale.com]

From: Ting Liu <ting.liu at freescale.com>

Changes:
1. Rebased on git://git.denx.de/u-boot.git v2015.01-487-gab92da9
2. Applied another 143 FSL/backported patches (git log ab92da9..)
3. add DEPENDS on dtc-native as u-boot brings in device tree files
4. use u-boot-with-spl-pbl.bin for nand
5. replace with u-boot-dtb.bin when swapping the image endianness

Signed-off-by: Ting Liu <ting.liu at freescale.com>
---
 .../u-boot/{u-boot-ls1_2014.07.bb => u-boot-ls1_2015.01.bb}      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-ls1_2014.07.bb => u-boot-ls1_2015.01.bb} (83%)

diff --git a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
similarity index 83%
rename from recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
rename to recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
index ad1dd4b..d68a326 100644
--- a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
+++ b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = " \
     file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
 
-SRCBRANCH = "sdk-v1.7.x"
+SRCBRANCH = "master"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
-SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
+SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
 
 LOCALVERSION ?= "-${SRCBRANCH}"
 
@@ -20,7 +20,7 @@ S = "${WORKDIR}/git"
 
 inherit fsl-u-boot-localversion
 
-DEPENDS += "change-file-endianess-native"
+DEPENDS += "change-file-endianess-native dtc-native"
 PROVIDES += "u-boot"
 
 do_compile_append () {
@@ -28,9 +28,10 @@ do_compile_append () {
     then
         for config in ${UBOOT_MACHINE}; do
             case "${config}" in
-                *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot.bin ${S}/${config}/u-boot.swap.bin 8
+                *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot-dtb.bin ${S}/${config}/u-boot.swap.bin 8
                 mv ${S}/${config}/u-boot.swap.bin ${S}/u-boot-${type}.${UBOOT_SUFFIX};;
                 *sdcard*)  mv ${S}/${config}/u-boot-with-spl-pbl.bin  ${S}/${config}/u-boot.bin;;
+                *nand*)  mv ${S}/u-boot-with-spl-pbl.bin  ${S}/u-boot.bin;;
             esac
         done
     fi
-- 
1.9.1