Patchwork [meta-fsl-arm,v3,6/6] u-boot-imx: Add branch information

login
register
mail settings
Submitter Otavio Salvador
Date Jan. 6, 2014, 6:09 p.m.
Message ID <1389031746-32226-6-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/64193/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Jan. 6, 2014, 6:09 p.m.
The new BitBake fetching code requires the revision to be available in
a know branch so we need to provide this information here.

This patch fixes 2009.08 and 2013.04 recipes.

Change-Id: Id4bbdcadb72e09eb7880ecf19b49bba0ede64f8e
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-imx_2009.08.bb | 10 +++++-----
 recipes-bsp/u-boot/u-boot-imx_2013.04.bb |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

Patch

diff --git a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
index 8460399..2db9db2 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
@@ -1,4 +1,4 @@ 
-# Copyright (C) 2011-2013 Freescale Semiconductor
+# Copyright (C) 2011-2014 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "bootloader for imx platforms"
@@ -13,16 +13,16 @@  DEPENDS_mxs += "elftosb-native"
 
 PR = "r15"
 
-# Revision of imx_2.6.35_10.12.01 branch
+SRCBRANCH_mx5 = "imx_v2009.08_10.12.01"
 SRCREV_mxs = "e4437f1c192a1a68028e6fcff3f50ff50352041d"
 
-# Revision of imx_2.6.35_11.09.01 branch
+SRCBRANCH_mx5 = "imx_v2009.08_11.09.01"
 SRCREV_mx5 = "897922d01c812be802e4a928b937535ea1b8e076"
 SRC_URI_append_imx5 = " \
            file://mx53_loco_bootenv.patch \
 "
 
-# Revision of imx_3.0.35_4.0.0 branch
+SRCBRANCH_mx6 = "imx_v2009.08_3.0.35_4.0.0"
 SRCREV_mx6 = "5899674bf39544bec47e209649a723cf7348d3ba"
 SRC_URI_append_mx6 = " \
    file://mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch \
@@ -31,7 +31,7 @@  SRC_URI_append_mx6 = " \
    file://mx6dl_sabresd-Change-default-environment-to-work-wit.patch \
 "
 
-SRC_URI = "git://git.freescale.com/imx/uboot-imx.git"
+SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;branch=${SRCBRANCH}"
 
 UBOOT_MACHINE_imx53qsb = "mx53_loco_config"
 UBOOT_MACHINE_imx53ard = "mx53_ard_ddr3_config"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb b/recipes-bsp/u-boot/u-boot-imx_2013.04.bb
index f96b159..ffa91c8 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2013.04.bb
@@ -1,4 +1,4 @@ 
-# Copyright (C) 2013 Freescale Semiconductor
+# Copyright (C) 2013, 2014 Freescale Semiconductor
 
 DESCRIPTION = "bootloader for imx platforms"
 require recipes-bsp/u-boot/u-boot.inc
@@ -8,8 +8,8 @@  PROVIDES += "u-boot"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-# revision of 3.10.9-1.0.0 alpha branch
-SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=imx_v2013.04"
+SRCBRANCH = "imx_v2013.04_3.10.9_1.0.0_alpha"
+SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
 SRCREV = "d20319c25d27c38fd531e0ea97b5661268449de6"
 
 S = "${WORKDIR}/git"