From 3b6835ac1bfe432236d8037f05469f7fb0ecdd8c Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 15 Sep 2014 11:17:21 +0200
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 b58cb3350..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 = "890524e864e638afe75c5eb95da57a330009e3f2"
+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 4d2401284..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 = "31f2fc414e30ff53bf3f924e488723369fe06a52"
+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 5a0e7fe78..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 = "a05be66816983ff13e9a0b9bd2294b3d03c6eb75"
+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 e18a3e354..30cf5edb3 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 = "8750ed1b73a92fc729ac0d937886dcadfd0aee7c"
-SRCREV_internal_mx6 = "0f6801577e2c54401fd917a49fdcac793d86ae2a"
+SRCREV_internal_mxs = "${AUTOREV}"
+SRCREV_internal_mx6 = "${AUTOREV}"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 # Kernel configuration fragments