From 23c8fec37b3f5d587307a7229cf64e4fcf24b9d9 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 8 Jul 2013 14:19:56 +0200
Subject: [PATCH] meta-digi-arm: share nvram and u-boot revisions

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/recipes-bsp/nvram/nvram.bb               | 9 ++-------
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc    | 9 +++++++++
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb | 9 +--------
 3 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc

diff --git a/meta-digi-arm/recipes-bsp/nvram/nvram.bb b/meta-digi-arm/recipes-bsp/nvram/nvram.bb
index 6e020250f..8432425a5 100644
--- a/meta-digi-arm/recipes-bsp/nvram/nvram.bb
+++ b/meta-digi-arm/recipes-bsp/nvram/nvram.bb
@@ -5,17 +5,12 @@ SECTION = "base"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
+require recipes-bsp/u-boot/u-boot-dey-rev.inc
+
 PR = "${DISTRO}.r0"
 
 DEPENDS = "libdigi"
 
-SRCREV_external = "107e05c6fff8ccae6d5eeb6a39d7efd57694e544"
-SRCREV_internal = "4af0b5f73215c6f075e17f866d831a948d777a2a"
-SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
-
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
-SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git"
-SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 SRC_URI += " \
     file://main.c \
     file://nvram_priv_linux.c \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc
new file mode 100644
index 000000000..a4fafea66
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc
@@ -0,0 +1,9 @@
+# Copyright (C) 2013 Digi International
+
+SRCREV_external = "62c951f321fc4ea40a70d85714c55520830e5acd"
+SRCREV_internal = "61ac25cbf81c10bda9e3a74005734f5e419aee5c"
+SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+
+SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
+SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git"
+SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
index ffcb755f6..6c8eec21b 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
@@ -2,6 +2,7 @@
 
 DESCRIPTION = "Bootloader for Digi platforms"
 require recipes-bsp/u-boot/u-boot.inc
+include u-boot-dey-rev.inc
 
 PROVIDES += "u-boot"
 
@@ -10,14 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
 
 PR = "r0"
 
-SRCREV_external = "62c951f321fc4ea40a70d85714c55520830e5acd"
-SRCREV_internal = "61ac25cbf81c10bda9e3a74005734f5e419aee5c"
-SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
-
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
-SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git"
-SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
-
 S = "${WORKDIR}/git"
 
 DEPENDS_mxs += "elftosb-native imx-bootlets-dey"