summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-11-21 15:02:08 (GMT)
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-11-21 15:02:08 (GMT)
commit8f9698fd9fc2fa783ff8d7e32a99f4d150ad0cb8 (patch)
tree959c87bba222916345f2f786057acea33770ca51
parent600b3a6af66223ba9ddc45209ece2b97bc06af19 (diff)
parente40bd7f09c0f754b0dab83573ef4795137f4857b (diff)
downloaddefinitions-8f9698fd9fc2fa783ff8d7e32a99f4d150ad0cb8.tar.gz
Merge remote-tracking branch 'origin/baserock/ps/unique-u-boots'
Reviewed-by: - Emmet Hikory - Richard Maw
-rw-r--r--strata/bsp-jetson.morph4
-rw-r--r--strata/bsp-jetson/u-boot@jetson.morph (renamed from strata/bsp-jetson/u-boot.morph)2
-rw-r--r--strata/bsp-wandboard.morph4
-rw-r--r--strata/bsp-wandboard/u-boot@wandboard.morph (renamed from strata/bsp-wandboard/u-boot.morph)2
4 files changed, 6 insertions, 6 deletions
diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph
index eda1d99..9d99254 100644
--- a/strata/bsp-jetson.morph
+++ b/strata/bsp-jetson.morph
@@ -18,7 +18,7 @@ chunks:
ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
unpetrify-ref: baserock/morph
build-depends: []
-- name: u-boot
+- name: u-boot@jetson
morph: strata/bsp-jetson/u-boot.morph
repo: upstream:u-boot
ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
@@ -31,7 +31,7 @@ chunks:
ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69
unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3
build-depends:
- - u-boot
+ - u-boot@jetson
- name: bsp-support
morph: strata/bsp-jetson/bsp-support.morph
repo: baserock:baserock/bsp-support
diff --git a/strata/bsp-jetson/u-boot.morph b/strata/bsp-jetson/u-boot@jetson.morph
index 705b385..1427e7f 100644
--- a/strata/bsp-jetson/u-boot.morph
+++ b/strata/bsp-jetson/u-boot@jetson.morph
@@ -1,4 +1,4 @@
-name: u-boot
+name: u-boot@jetson
kind: chunk
configure-commands:
- make ARCH=arm jetson-tk1_config
diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph
index 4b07b15..0b01610 100644
--- a/strata/bsp-wandboard.morph
+++ b/strata/bsp-wandboard.morph
@@ -4,7 +4,7 @@ description: The platform dependent components required to boot an wandboard ARM
build-depends:
- morph: strata/core.morph
chunks:
-- name: u-boot
+- name: u-boot@wandboard
morph: strata/bsp-wandboard/u-boot.morph
repo: upstream:u-boot
ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
@@ -16,4 +16,4 @@ chunks:
ref: 9573986cf27ff44814f3efb1f1e95638406db456
unpetrify-ref: baserock/morph
build-depends:
- - u-boot
+ - u-boot@wandboard
diff --git a/strata/bsp-wandboard/u-boot.morph b/strata/bsp-wandboard/u-boot@wandboard.morph
index 9be30bc..8a51ee7 100644
--- a/strata/bsp-wandboard/u-boot.morph
+++ b/strata/bsp-wandboard/u-boot@wandboard.morph
@@ -1,4 +1,4 @@
-name: u-boot
+name: u-boot@wandboard
kind: chunk
build-commands:
- make tools