From ce8d6756ab3c4ad9b3d810da08cbc3cc73213869 Mon Sep 17 00:00:00 2001
From: Ting Liu <ting.liu@freescale.com>
Date: Fri, 10 Jul 2015 17:45:10 +0800
Subject: u-boot-ls1: update to revision v2015.01-630-g6ba8eed

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@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb | 47 -------------------------------
 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb | 48 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 47 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb

diff --git a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
deleted file mode 100644
index ad1dd4b..0000000
--- a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-
-DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards"
-LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
-LIC_FILES_CHKSUM = " \
-    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
-    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
-"
-
-SRCBRANCH = "sdk-v1.7.x"
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
-SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
-
-LOCALVERSION ?= "-${SRCBRANCH}"
-
-S = "${WORKDIR}/git"
-
-inherit fsl-u-boot-localversion
-
-DEPENDS += "change-file-endianess-native"
-PROVIDES += "u-boot"
-
-do_compile_append () {
-    if [ "x${UBOOT_CONFIG}" != "x" ]
-    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
-                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;;
-            esac
-        done
-    fi
-
-}
-
-PACKAGES += "${PN}-images"
-FILES_${PN}-images += "/boot"
-
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ls102xa)"
-
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
new file mode 100644
index 0000000..716105f
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
@@ -0,0 +1,48 @@
+require recipes-bsp/u-boot/u-boot.inc
+
+DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ Layerscape1 boards"
+LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+"
+
+SRCBRANCH = "master"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
+SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
+
+LOCALVERSION ?= "+ls1"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+DEPENDS += "change-file-endianess-native dtc-native"
+PROVIDES += "u-boot"
+
+do_compile_append () {
+    if [ "x${UBOOT_CONFIG}" != "x" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            case "${config}" in
+                *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
+
+}
+
+PACKAGES += "${PN}-images"
+FILES_${PN}-images += "/boot"
+
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls102xa)"
+
-- 
cgit v1.2.3-54-g00ecf