diff options
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 | ||
| 57 | inherit fsl-u-boot-localversion | 57 | inherit fsl-u-boot-localversion |
| 58 | 58 | ||
| 59 | LOCALVERSION = "+imx" | 59 | LOCALVERSION ?= "-${SRCBRANCH}" |
| 60 | 60 | ||
| 61 | do_compile_prepend() { | 61 | do_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 | ||
| 17 | inherit fsl-u-boot-localversion | 17 | inherit fsl-u-boot-localversion |
| 18 | 18 | ||
| 19 | LOCALVERSION = "+imx" | 19 | LOCALVERSION ?= "-${SRCBRANCH}" |
| 20 | 20 | ||
| 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 22 | COMPATIBLE_MACHINE = "(mx6)" | 22 | COMPATIBLE_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" | |||
| 12 | SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}" | 12 | SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}" |
| 13 | SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469" | 13 | SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469" |
| 14 | 14 | ||
| 15 | LOCALVERSION ?= "-${SRCBRANCH}" | ||
| 16 | |||
| 15 | S = "${WORKDIR}/git" | 17 | S = "${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 | |||
| 2 | require u-boot-ls1.inc | 2 | require u-boot-ls1.inc |
| 3 | inherit fsl-u-boot-localversion | 3 | inherit fsl-u-boot-localversion |
| 4 | 4 | ||
| 5 | LOCALVERSION ?= "+ls1" | 5 | LOCALVERSION ?= "-SDK-V1.3" |
| 6 | 6 | ||
| 7 | DEPENDS += "u-boot-ls1-tools-native" | 7 | DEPENDS += "u-boot-ls1-tools-native" |
| 8 | PROVIDES += "u-boot" | 8 | PROVIDES += "u-boot" |
