From 077362faa331f4d10a5da6a90fbf785840d6fae0 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 12 Jun 2014 15:27:14 +0100
Subject: Explicitly separate linux chunk names for bsp variants

Simplifying 'morph edit' syntax showed that we have several
different versions of the chunk called 'linux'. This patch
versions of linux to match what they are for.

This patch was originally written by Paul Sherwood, but the name of
the morphology also has to be set in the chunk morphology, so wasn't
sufficient by itself.

Instead of making the changes in the 7 kernel trees that we had, they
have now all been merged into one, hence the sha1s and refs have also
been updated.
---
 bsp-armv7-highbank.morph      | 6 +++---
 bsp-armv7-versatile.morph     | 6 +++---
 bsp-armv7b-highbank.morph     | 6 +++---
 bsp-armv7b-vexpress-tc2.morph | 6 +++---
 bsp-ppc64-generic.morph       | 6 +++---
 bsp-wandboard.morph           | 6 +++---
 bsp-x86_32-generic.morph      | 4 ++--
 bsp-x86_64-generic.morph      | 4 ++--
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph
index ea791c6f..88922e27 100644
--- a/bsp-armv7-highbank.morph
+++ b/bsp-armv7-highbank.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot an ARM highbank
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7-highbank
   repo: upstream:linux
-  ref: cb27bf639e30c5126361c9cb7dd32c2e36a98d8a
-  unpetrify-ref: baserock/arm/highbank
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph
index 797fdeec..cc1298f1 100644
--- a/bsp-armv7-versatile.morph
+++ b/bsp-armv7-versatile.morph
@@ -5,8 +5,8 @@ description: The platform dependent components required to boot an ARM versatile
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7-versatile
   repo: upstream:linux
-  ref: 5a9b14cc3d6bc4060cc55ed6e1d2b5565b201ad5
-  unpetrify-ref: baserock/arm/versatile
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank.morph
index 491f0948..0a94bcc1 100644
--- a/bsp-armv7b-highbank.morph
+++ b/bsp-armv7b-highbank.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot an ARM highbank
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7b-highbank
   repo: upstream:linux
-  ref: ba8aac8133ac7191b6cdf3f1f62c70eb3983be17
-  unpetrify-ref: baserock/arm/highbank-be
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-armv7b-vexpress-tc2.morph b/bsp-armv7b-vexpress-tc2.morph
index 3446cb9a..d8abde2d 100644
--- a/bsp-armv7b-vexpress-tc2.morph
+++ b/bsp-armv7b-vexpress-tc2.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot Versatile TC2 bo
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7b-vexpress-tc2
   repo: upstream:linux
-  ref: db9d2e3dd6fc61f0f7a01ce11ad10f27e648e2b0
-  unpetrify-ref: baserock/arm/vexpress-tc2
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-ppc64-generic.morph b/bsp-ppc64-generic.morph
index d765e6c2..fdafb86f 100644
--- a/bsp-ppc64-generic.morph
+++ b/bsp-ppc64-generic.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot a ppc64 board.
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-ppc64
   repo: upstream:linux
-  ref: 7758cbb7fe9277c8486d87791f0e5f1398d0fb22
-  unpetrify-ref: baserock/powerpc/ppc64
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-wandboard.morph b/bsp-wandboard.morph
index 95f61bc9..fa2bb79d 100644
--- a/bsp-wandboard.morph
+++ b/bsp-wandboard.morph
@@ -9,9 +9,9 @@ chunks:
   ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: linux
+- name: linux-armv7-wandboard
   repo: upstream:linux
-  ref: 635ad1134d5e3fccf8c9ec50983b8d39e1493ae9
-  unpetrify-ref: baserock/arm/wandboard_bsp
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends:
   - u-boot
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph
index b6cb845a..625f854c 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic.morph
@@ -5,9 +5,9 @@ description: The set of platform specific components required for booting a 32-b
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-x86-32-generic
   repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: nasm
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index a824fdfc..ea7ab404 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -5,9 +5,9 @@ description: The set of platform specific components required for booting a 64-b
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-x86-64-generic
   repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: nasm
-- 
cgit v1.2.1