From 98ad95b8649df107d83052df4523f446d682464a Mon Sep 17 00:00:00 2001
From: Chunrong Guo <B40290@freescale.com>
Date: Tue, 6 Jan 2015 14:42:14 +0800
Subject: u-boot-ls1: Upgrade to 2014.07 version

   This includes following changes:
   2bf1c34 ls102xa: scfg: Remove SCFG bit reverse setting on LS1
   80b1d30 ls1021atwr: SECURE BOOT- Add secure boot target for ls1021atwr
   49eaf3e board/ls1021aqds: Add support to test GPIO by enabling EC3
   16111c4 ls102xa: spi: Fix QSPI and DSPI compatibility issue on LS1021ATWR board

Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-ls1.inc        |  6 +++---
 recipes-bsp/u-boot/u-boot-ls1_2013.10.bb | 24 ------------------------
 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb

diff --git a/recipes-bsp/u-boot/u-boot-ls1.inc b/recipes-bsp/u-boot/u-boot-ls1.inc
index 9e10ea5..ccd37c6 100644
--- a/recipes-bsp/u-boot/u-boot-ls1.inc
+++ b/recipes-bsp/u-boot/u-boot-ls1.inc
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = " \
     file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
 
-SRCBRANCH = "LS1-dev"
-SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}"
-SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469"
+SRCBRANCH = "sdk-v1.7.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
+SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
 
 LOCALVERSION ?= "-${SRCBRANCH}"
 
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb b/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
deleted file mode 100644
index 06f6d2f..0000000
--- a/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-ls1.inc
-inherit fsl-u-boot-localversion
-
-LOCALVERSION ?= "-SDK-V1.3"
-
-DEPENDS += "u-boot-ls1-tools-native"
-PROVIDES += "u-boot"
-
-do_compile_append () {
-    case "${UBOOT_MACHINE}" in
-        *spi*) tclsh byte_swap.tcl ${S}/u-boot.bin ${S}/u-boot.swap.bin 8 
-        mv ${S}/u-boot.swap.bin ${S}/u-boot.bin;;
-    esac
-}
-
-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_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
new file mode 100644
index 0000000..96944c1
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
@@ -0,0 +1,24 @@
+require recipes-bsp/u-boot/u-boot.inc
+require u-boot-ls1.inc
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-${SRCBRANCH}"
+
+DEPENDS += "u-boot-ls1-tools-native"
+PROVIDES += "u-boot"
+
+do_compile_append () {
+    case "${UBOOT_MACHINE}" in
+        *spi*) tclsh byte_swap.tcl ${S}/u-boot.bin ${S}/u-boot.swap.bin 8 
+        mv ${S}/u-boot.swap.bin ${S}/u-boot.bin;;
+    esac
+}
+
+PACKAGES += "${PN}-images"
+FILES_${PN}-images += "/boot"
+
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls102xa)"
+
-- 
cgit v1.2.3-54-g00ecf