summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorStefan Herbrechtsmeier <stefan@herbrechtsmeier.net>2012-04-05 13:48:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-06 01:12:46 +0100
commitdf21414331815a2ba5102796005c47afcaf7eb28 (patch)
tree7d6e8477a8d9234736b00b2aac42154d079a3904 /meta/recipes-bsp/u-boot
parent885485f74c480a73ec1a453901c12dfca30576a9 (diff)
downloadpoky-df21414331815a2ba5102796005c47afcaf7eb28.tar.gz
u-boot: add machine name to spl image name
(From OE-Core rev: 794225ed3b6fe7878595b7452259cc9bf1973213) Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2011.03.bb2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2011.06.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 700d5d39f4..0445c343d3 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -32,7 +32,7 @@ UBOOT_MAKE_TARGET ?= "all"
32# deploy directory. For those versions they can set the following variables 32# deploy directory. For those versions they can set the following variables
33# to allow packaging the SPL. 33# to allow packaging the SPL.
34SPL_BINARY ?= "" 34SPL_BINARY ?= ""
35SPL_IMAGE ?= "${SPL_BINARY}-${PV}-${PR}" 35SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
36SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" 36SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
37 37
38do_compile () { 38do_compile () {
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
index 1ebdbeabca..e99bc2cab4 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}"
17SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" 17SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca"
18 18
19PV = "v2011.03+git${SRCPV}" 19PV = "v2011.03+git${SRCPV}"
20PR = "r5" 20PR = "r6"
21 21
22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
23 23
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
index 8ebdbff5ea..680401f45b 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}"
17SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" 17SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a"
18 18
19PV = "v2011.06+git${SRCPV}" 19PV = "v2011.06+git${SRCPV}"
20PR = "r0" 20PR = "r1"
21 21
22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
23 23