summaryrefslogtreecommitdiff
path: root/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2014-10-30 15:08:06 +0100
committerMax Krummenacher <max.oss.09@gmail.com>2014-10-30 15:31:06 +0100
commitc36fd4df96269c6fbdad3e224aa032439cec8b1d (patch)
tree8e49f32852befcb0f6568809e9eae13b3794707a /recipes-bsp/u-boot
parent0c40252fd8040e57f25c42be0cbf1028a565284d (diff)
u-boot: iMX6/VF update to latest from git
Diffstat (limited to 'recipes-bsp/u-boot')
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb11
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb6
2 files changed, 9 insertions, 8 deletions
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
index 5bef270..32adf46 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
@@ -6,16 +6,17 @@ SECTION = "bootloader"
PROVIDES = "u-boot-fw-utils"
DEPENDS = "mtd-utils"
-COMPATIBLE_MACHINE = "(colibri-vf|apalis-imx6)"
+COMPATIBLE_MACHINE = "(colibri-vf|colibri-imx6|apalis-imx6)"
DEFAULT_PREFERENCE_colibri-vf = "1"
DEFAULT_PREFERENCE_apalis-imx6 = "1"
+DEFAULT_PREFERENCE_colibri-imx6 = "1"
FILESPATHPKG =. "git:"
S="${WORKDIR}/git"
-SRCREV_colibri-vf = "2eb36b88d4b5bce64bb3a196fa8b2be5b24bc165"
-SRCREV_apalis-imx6 = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
-SRCBRANCH_colibri-vf = "2014.10-toradex-next"
-SRCBRANCH_apalis-imx6 = "2014.04-toradex"
+SRCREV_colibri-vf = "67c3a4aee6c0af124ce779aed1be70c7a92d0916"
+SRCREV_mx6 = "d4c752ac0eca88873e73a5a3bee6573f6d0ec92a"
+SRCBRANCH_colibri-vf = "2014.10-toradex"
+SRCBRANCH_mx6 = "2014.04-toradex"
SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH} \
file://fw_env.config \
"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
index dc2c2b3..09d5493 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -11,9 +11,9 @@ PR = "r0"
S = "${WORKDIR}/git"
-SRCREV_colibri-vf = "2eb36b88d4b5bce64bb3a196fa8b2be5b24bc165"
-SRCBRANCH_colibri-vf = "2014.10-toradex-next"
-SRCREV_mx6 = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
+SRCREV_colibri-vf = "67c3a4aee6c0af124ce779aed1be70c7a92d0916"
+SRCBRANCH_colibri-vf = "2014.10-toradex"
+SRCREV_mx6 = "d4c752ac0eca88873e73a5a3bee6573f6d0ec92a"
SRCBRANCH_mx6 = "2014.04-toradex"
SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}"