From e814742ebd9f7e48da993e4699b674d501e95dc4 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 13 Jan 2015 18:22:07 +0100
Subject: [PATCH] meta-digi: revert revisions to AUTOREV

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc | 4 ++--
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++--
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc | 4 ++--
 meta-digi-arm/recipes-kernel/linux/linux-dey.inc            | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb   | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb        | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
index 17383f635..7e154b74a 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
@@ -4,11 +4,11 @@
 SRCBRANCH = "v2009.08/dub-1.6/maint"
 
 SRCREV_external = ""
-SRCREV_internal = "ed3860a8d3b6da0e60f85aa9a165add33a7022ab"
+SRCREV_internal = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;nobranch=1"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 UBOOT_NVRAM_LIBPATH = "git/common/digi/cmd_nvram/lib"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
index 181d67ee4..714410fc4 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
@@ -4,11 +4,11 @@
 SRCBRANCH = "v2013.01/master"
 
 SRCREV_external = ""
-SRCREV_internal = "341da7cae490e888f9c1d08c5759ca2105aeb1ee"
+SRCREV_internal = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;nobranch=1"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc
index e73967b8c..b5a644a22 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc
@@ -4,9 +4,9 @@
 SRCBRANCH = "v2013.04/master"
 
 SRCREV_external = ""
-SRCREV_internal = "00a4fdb2c84bc232e590263237fc0f894bcadd6a"
+SRCREV_internal = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;nobranch=1"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index 8e15dad16..20b492f4b 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -5,7 +5,7 @@ require recipes-kernel/linux/linux-imx.inc
 LOCALVERSION = "-dey"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;nobranch=1"
+SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI = " \
     ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
     file://defconfig \
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
index 6a2fe22bf..9d981028f 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
@@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "(mxs|mx5)"
 SRCBRANCH = "v2.6.35/dey-1.4/maint"
 
 SRCREV_external = ""
-SRCREV_internal = "2c67c6a8930ae36eadcd7026fc3e6f41b1e42392"
+SRCREV_internal = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 KERNEL_CFG_FRAGS ?= ""
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
index 749f5d937..26187247a 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
@@ -14,8 +14,8 @@ SRCREV_external = ""
 SRCREV_external_mxs = ""
 SRCREV_external_mx6 = ""
 SRCREV_internal = ""
-SRCREV_internal_mxs = "313db2db8d566caad3c9c89145712ebee1a47340"
-SRCREV_internal_mx6 = "c5a5cfe41423eee270369b33f0e94ec4b72f64ad"
+SRCREV_internal_mxs = "${AUTOREV}"
+SRCREV_internal_mx6 = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 # Kernel configuration fragments