summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-06-01 16:24:05 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-06-03 17:16:05 (GMT)
commitd97fc15c8729c0a6bb53c1d0e05fc62fa3ef5d4f (patch)
tree424f3b64db278128835949c1f3489a175111a23c
parentad6ac8a55a58b1c8f2cd7cc3591c744a905c1340 (diff)
downloadmeta-intel-d97fc15c8729c0a6bb53c1d0e05fc62fa3ef5d4f.tar.gz
meta-fishriver: remove crownbay specifics
The fishriver BSP was borrowing a few things from crownbay, but now has its own branch, so remove the crownbay-specific items. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-fishriver/README13
-rw-r--r--meta-fishriver/conf/machine/fishriver.conf4
-rw-r--r--meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend4
-rw-r--r--meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend3
4 files changed, 5 insertions, 19 deletions
diff --git a/meta-fishriver/README b/meta-fishriver/README
index 1ffbbf1..013f76e 100644
--- a/meta-fishriver/README
+++ b/meta-fishriver/README
@@ -11,19 +11,6 @@ Table of Contents
11III. Booting the images in /binary 11III. Booting the images in /binary
12 12
13 13
14I. Special notes on the meta-fishriver BSP layer
15================================================
16
17The meta-fishriver layer currently and temporarily uses the crownbay
18kernel branch. This will change once we have new patches and/or
19config changes for:
20
21- Zigbee
22- wifi
23- upstream gma500
24- EMGD?
25
26
27II. Building the meta-fishriver BSP layer 14II. Building the meta-fishriver BSP layer
28========================================= 15=========================================
29 16
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index e562752..861ca8b 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -38,5 +38,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
38SRCREV_machine_pn-linux-yocto_fishriver ?= "301ab1710d29a9bb931cb64c747d03da09dfea3f" 38SRCREV_machine_pn-linux-yocto_fishriver ?= "301ab1710d29a9bb931cb64c747d03da09dfea3f"
39SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" 39SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
40 40
41SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" 41SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
42SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" 42SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
index dcc4534..29399ba 100644
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
@@ -1,5 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3COMPATIBLE_MACHINE_fishriver = "crownbay" 3COMPATIBLE_MACHINE_fishriver = "fishriver"
4KMACHINE_fishriver = "crownbay" 4KMACHINE_fishriver = "fishriver"
5 5
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
index ba38dbe..eec65d8 100644
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
@@ -1,4 +1,3 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_fishriver = "fishriver" 2COMPATIBLE_MACHINE_fishriver = "fishriver"
3# zzzz /yocto/standard/crownbay->fishriver 3KMACHINE_fishriver = "yocto/standard/fishriver"
4KMACHINE_fishriver = "yocto/standard/crownbay"