From 350e7c311c8d661be3d62860088de2845fb4e307 Mon Sep 17 00:00:00 2001
From: Nathan Rossi <nathan.rossi@xilinx.com>
Date: Mon, 25 Aug 2014 16:58:05 -0700
Subject: u-boot-xlnx: Rename "_git" to "-dev" for master-next tracking recipe

* Change to match how the kernel recipes handle master-next tracking
* Update the SRCREV to match a newer git commit

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
---
 recipes-bsp/u-boot/u-boot-xlnx-dev.bb | 22 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-xlnx_git.bb | 29 -----------------------------
 2 files changed, 22 insertions(+), 29 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-xlnx-dev.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-xlnx_git.bb

diff --git a/recipes-bsp/u-boot/u-boot-xlnx-dev.bb b/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
new file mode 100644
index 00000000..274c621c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
@@ -0,0 +1,22 @@
+# This recipe allows for a 'bleeding edge' u-boot-xlnx build.
+# Since this tree is frequently updated, AUTOREV is used to track its contents.
+#
+# To enable this recipe, set the following in your machine or local.conf
+#   PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx-dev"
+#   PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx-dev"
+
+UBOOT_XLNX_DEV_BRANCH ?= "master-next"
+
+include u-boot-xlnx.inc
+
+LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c"
+
+SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https;branch=${UBOOT_XLNX_DEV_BRANCH}"
+SRCREV="67f6167a0f808ca7051a337858e0db237ce2b972"
+
+python () {
+    d.setVar("SRCREV", "${AUTOREV}")
+}
+
+PR = "r0"
+PV = "${UBOOT_XLNX_DEV_BRANCH}${XILINX_EXTENSION}+git"
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_git.bb b/recipes-bsp/u-boot/u-boot-xlnx_git.bb
deleted file mode 100644
index 1ba3e694..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-# This recipe allows for a 'bleeding edge' u-boot-xlnx build.
-# Since this tree is frequently updated, AUTOREV is used to track its contents.
-#
-# To enable this recipe, set
-# PREFERRED_VERSION_u-boot-xlnx ?= "${UBOOT_XLNX_DEV_BRANCH}"
-# Alternatively to track and build master branch instead, set
-# UBOOT_XLNX_DEV_BRANCH ?= "master"
-# PREFERRED_VERSION_u-boot-xlnx ?= "${UBOOT_XLNX_DEV_BRANCH}"
-
-UBOOT_XLNX_DEV_BRANCH ?= "master-next"
-
-include u-boot-xlnx.inc
-
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c"
-
-SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https;branch=${UBOOT_XLNX_DEV_BRANCH}"
-
-# Set default SRCREVs. SRCREVs statically set to prevent network access during 
-# parsing.  
-# AUTOREV is set in the anonymous python routine and resolved when the variables 
-# are finalized.
-SRCREV="f40924452f947fbd6886eaa677c1b0bd47edfcf5"
-
-python () {
-    d.setVar("SRCREV", "${AUTOREV}")
-}
-
-PR = "r0"
-PV = "${UBOOT_XLNX_DEV_BRANCH}${XILINX_EXTENSION}+git"
-- 
cgit v1.2.3-54-g00ecf