From 57ecbf71c7a0ccaab1aaa50e96489ea0551fc13f Mon Sep 17 00:00:00 2001
From: Lauren Post <lauren.post@freescale.com>
Date: Fri, 31 Jul 2015 09:18:41 -0500
Subject: u-boot-imx: Upgrade to 2015.04 version

Upgrade to 2015.04 version and add i.MX 6UltraLite.

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_2014.04.bb |  4 ----
 recipes-bsp/u-boot/u-boot-imx-mfgtool_2015.04.bb |  4 ++++
 recipes-bsp/u-boot/u-boot-imx_2014.04.bb         | 22 ----------------------
 recipes-bsp/u-boot/u-boot-imx_2015.04.bb         | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2015.04.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx_2014.04.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-imx_2015.04.bb

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
deleted file mode 100644
index f66114c..0000000
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.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_2015.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2015.04.bb
new file mode 100644
index 0000000..f66114c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2015.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_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
deleted file mode 100644
index c4c8670..0000000
--- a/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2013-2015 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.14.38_6qp_beta"
-SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
-SRCREV = "6e9282c2567b2820699fa55d2c6bf0ab78e992d6"
-
-S = "${WORKDIR}/git"
-
-inherit fsl-u-boot-localversion
-
-LOCALVERSION ?= "-${SRCBRANCH}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2015.04.bb b/recipes-bsp/u-boot/u-boot-imx_2015.04.bb
new file mode 100644
index 0000000..ab53d9d
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx_2015.04.bb
@@ -0,0 +1,22 @@
+# Copyright (C) 2013-2015 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_v2015.04_3.14.38_6ul7d_beta"
+SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "b026e66a5bb6c2b6fda9e353dfe9061306c69da4"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-${SRCBRANCH}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6|mx7)"
-- 
cgit v1.2.3-54-g00ecf