summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb2
-rw-r--r--meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb2
-rw-r--r--meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc2
-rw-r--r--meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb2
4 files changed, 5 insertions, 3 deletions
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
index c067999ff..5a831ece6 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
@@ -56,7 +56,7 @@ EXTRA_OEMAKE += 'HOSTSTRIP=true'
56 56
57inherit fsl-u-boot-localversion 57inherit fsl-u-boot-localversion
58 58
59LOCALVERSION = "+imx" 59LOCALVERSION ?= "-${SRCBRANCH}"
60 60
61do_compile_prepend() { 61do_compile_prepend() {
62 if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then 62 if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
index 0c9c143ef..bb48044d4 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
16 16
17inherit fsl-u-boot-localversion 17inherit fsl-u-boot-localversion
18 18
19LOCALVERSION = "+imx" 19LOCALVERSION ?= "-${SRCBRANCH}"
20 20
21PACKAGE_ARCH = "${MACHINE_ARCH}" 21PACKAGE_ARCH = "${MACHINE_ARCH}"
22COMPATIBLE_MACHINE = "(mx6)" 22COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc
index 371773ff6..9e10ea52e 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc
@@ -12,4 +12,6 @@ SRCBRANCH = "LS1-dev"
12SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}" 12SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}"
13SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469" 13SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469"
14 14
15LOCALVERSION ?= "-${SRCBRANCH}"
16
15S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
index f50c1444e..06f6d2f7a 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
@@ -2,7 +2,7 @@ require recipes-bsp/u-boot/u-boot.inc
2require u-boot-ls1.inc 2require u-boot-ls1.inc
3inherit fsl-u-boot-localversion 3inherit fsl-u-boot-localversion
4 4
5LOCALVERSION ?= "+ls1" 5LOCALVERSION ?= "-SDK-V1.3"
6 6
7DEPENDS += "u-boot-ls1-tools-native" 7DEPENDS += "u-boot-ls1-tools-native"
8PROVIDES += "u-boot" 8PROVIDES += "u-boot"