From 7bdeb7b460552d5ad4fa221877cbb3174cb02707 Mon Sep 17 00:00:00 2001
From: Lauren Post <lauren.post@freescale.com>
Date: Thu, 4 Sep 2014 08:12:50 -0500
Subject: u-boot-imx: Upgrade to 2014.04 version

- Add mx6sx support
- General fixes for mx6slevk and other mx6
- Support to use zImage

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2013.04.bb |  4 ----
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb |  4 ++++
 recipes-bsp/u-boot/u-boot-imx_2013.04.bb         | 22 ----------------------
 recipes-bsp/u-boot/u-boot-imx_2014.04.bb         | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2013.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx_2013.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx_2014.04.bb

diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2013.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2013.04.bb
deleted file mode 100644
index f66114c..0000000
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2013.04.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2014 O.S. Systems Software LTDA.
-
-require u-boot-imx_${PV}.bb
-require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
new file mode 100644
index 0000000..f66114c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
@@ -0,0 +1,4 @@
+# Copyright (C) 2014 O.S. Systems Software LTDA.
+
+require u-boot-imx_${PV}.bb
+require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb b/recipes-bsp/u-boot/u-boot-imx_2013.04.bb
deleted file mode 100644
index 28574f8..0000000
--- a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-
-DESCRIPTION = "U-Boot provided by Freescale with focus on  i.MX reference boards."
-require recipes-bsp/u-boot/u-boot.inc
-
-PROVIDES += "u-boot"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
-SRCBRANCH = "imx_v2013.04_3.10.17_1.0.0_ga"
-SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
-SRCREV = "06dd4f798b2014ed9642f8d6f526aa9630dd8ca5"
-
-S = "${WORKDIR}/git"
-
-inherit fsl-u-boot-localversion
-
-LOCALVERSION = "+imx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
new file mode 100644
index 0000000..0c9c143
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
@@ -0,0 +1,22 @@
+# Copyright (C) 2013, 2014 Freescale Semiconductor
+
+DESCRIPTION = "U-Boot provided by Freescale with focus on  i.MX reference boards."
+require recipes-bsp/u-boot/u-boot.inc
+
+PROVIDES += "u-boot"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCBRANCH = "imx_v2014.04_3.10.31_1.1.0_beta"
+SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "91cbd4d530f240042d112fc4166a143fa659524b"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+LOCALVERSION = "+imx"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6)"
-- 
cgit v1.2.3-54-g00ecf