From 5726d9770278f885d784531d2bd712440407e70a Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 26 Jul 2016 11:57:56 +0200
Subject: [PATCH] meta-digi: revert kernel and u-boot revisions to AUTOREV

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 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_2015.04.bb      | 4 ++--
 meta-digi-arm/recipes-kernel/linux/linux-dey.inc            | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb        | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb        | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

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 cdc6d44d1..709bbd97a 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
@@ -1,11 +1,11 @@
 # Copyright (C) 2013 Digi International
 
 SRCBRANCH = "v2013.01/dub-2.0/maint"
-SRCREV = "dfc9c241d7b8171dddb804bc2c4f7fa431386c23"
+SRCREV = "${AUTOREV}"
 
 # Select internal or Github U-Boot repo
 UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
 
-SRC_URI = "${UBOOT_GIT_URI};nobranch=1"
+SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}"
 
 UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
index 0eb6bf77d..4ddc949d0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native',
 PROVIDES += "u-boot"
 
 SRCBRANCH = "v2015.04/maint"
-SRCREV = "503966879d788ee738190abc6a0c07320cd02e76"
+SRCREV = "${AUTOREV}"
 
 # Select internal or Github U-Boot repo
 UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
 
 SRC_URI = " \
-    ${UBOOT_GIT_URI};nobranch=1 \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
 "
 
 SRC_URI_append = " \
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index c61e1941d..19c71f113 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -15,7 +15,7 @@ LOCALVERSION = "-dey"
 LINUX_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
 
 SRC_URI = " \
-    ${LINUX_GIT_URI};nobranch=1 \
+    ${LINUX_GIT_URI};branch=${SRCBRANCH} \
     file://defconfig \
 "
 
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 3a5c3eecd..bc82533ed 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
@@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc
 require recipes-kernel/linux/linux-dtb.inc
 
 SRCBRANCH = "v3.10/dey-1.4/maint"
-SRCREV = "aa1701793ab27ccfe4931bbc55b46f6b9cb442e7"
+SRCREV = "${AUTOREV}"
 
 config_dts() {
 	for DTB in ${KERNEL_DEVICETREE}; do
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
index 6c84cf559..6819a65b9 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
@@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc
 inherit fsl-vivante-kernel-driver-handler
 
 SRCBRANCH = "v3.14/dey-2.0/maint"
-SRCREV = "1d2fe70cd126a1102ae1db0e8b214ac5f064521f"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb
index 4a25bbcfd..6a5ceeccc 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb
@@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc
 require recipes-kernel/linux/linux-dtb.inc
 
 SRCBRANCH = "v4.1/dey-2.0/maint"
-SRCREV = "c3348827dd46c16640c6667c8464a2cfc8e156fa"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx6ul)"