From fb1da18ea1e4ba2c8307b3679d8e0e9d173771a6 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 7 Aug 2014 14:26:48 +0200 Subject: [PATCH] meta-digi: update revisions for dey-1.6.2.1 Signed-off-by: Javier Viguera --- .../recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc | 6 +++--- .../recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 6 +++--- .../recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc | 6 +++--- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 8 ++++---- 6 files changed, 16 insertions(+), 16 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 082846381..b58cb3350 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 @@ -3,12 +3,12 @@ # Internal repo branch SRCBRANCH = "v2009.08/dub-1.6/maint" -SRCREV_external = "8b22aa710c72a5daeb6f79852f1a4fb08abf37d4" -SRCREV_internal = "${AUTOREV}" +SRCREV_external = "" +SRCREV_internal = "890524e864e638afe75c5eb95da57a330009e3f2" 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;branch=${SRCBRANCH}" +SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;nobranch=1" 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 a797167a9..4d2401284 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 @@ -3,12 +3,12 @@ # Internal repo branch SRCBRANCH = "v2013.01/master" -SRCREV_external = "a02784c8a21e04515c8905a32e947cb776b4f565" -SRCREV_internal = "${AUTOREV}" +SRCREV_external = "" +SRCREV_internal = "31f2fc414e30ff53bf3f924e488723369fe06a52" 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;branch=${SRCBRANCH}" +SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;nobranch=1" 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 7e5f9d73b..5a0e7fe78 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 @@ -3,10 +3,10 @@ # Internal repo branch SRCBRANCH = "v2013.04/master" -SRCREV_external = "71a9263c710a58c1c97307238507c6e7804101ee" -SRCREV_internal = "${AUTOREV}" +SRCREV_external = "" +SRCREV_internal = "a05be66816983ff13e9a0b9bd2294b3d03c6eb75" 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;branch=${SRCBRANCH}" +SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;nobranch=1" 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 20b492f4b..8e15dad16 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;branch=${SRCBRANCH}" +SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;nobranch=1" 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 e7e2588c5..6a2fe22bf 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 @@ -7,8 +7,8 @@ COMPATIBLE_MACHINE = "(mxs|mx5)" # Internal repo branch SRCBRANCH = "v2.6.35/dey-1.4/maint" -SRCREV_external = "04e6c93c509e4f0b2fe6c713674704f3b3fa1416" -SRCREV_internal = "${AUTOREV}" +SRCREV_external = "" +SRCREV_internal = "2c67c6a8930ae36eadcd7026fc3e6f41b1e42392" 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 8498a3ca0..e18a3e354 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 @@ -11,11 +11,11 @@ SRCBRANCH_mxs = "v3.10/dey-1.4/maint" SRCBRANCH_mx6 = "v3.10/dey-1.6/maint" SRCREV_external = "" -SRCREV_external_mxs = "bccdf5cb75ba94d642c7893ba166dd1cb7d38985" -SRCREV_external_mx6 = "c297650949c74e7010705a131f9a175609c19835" +SRCREV_external_mxs = "" +SRCREV_external_mx6 = "" SRCREV_internal = "" -SRCREV_internal_mxs = "${AUTOREV}" -SRCREV_internal_mx6 = "${AUTOREV}" +SRCREV_internal_mxs = "8750ed1b73a92fc729ac0d937886dcadfd0aee7c" +SRCREV_internal_mx6 = "0f6801577e2c54401fd917a49fdcac793d86ae2a" SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" # Kernel configuration fragments