[PATCH 1/1] meta-fishriver: remove crownbay specifics


tom.zanussi@...
 

From: Tom Zanussi <tom.zanussi@...>

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@...>
---
meta-fishriver/README | 13 -------------
meta-fishriver/conf/machine/fishriver.conf | 4 ++--
.../linux/linux-yocto-stable_git.bbappend | 4 ++--
.../recipes-kernel/linux/linux-yocto_git.bbappend | 3 +--
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
III. Booting the images in /binary


-I. Special notes on the meta-fishriver BSP layer
-================================================
-
-The meta-fishriver layer currently and temporarily uses the crownbay
-kernel branch. This will change once we have new patches and/or
-config changes for:
-
-- Zigbee
-- wifi
-- upstream gma500
-- EMGD?
-
-
II. Building the meta-fishriver BSP layer
=========================================

diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 05c9afe..371871f 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -38,5 +38,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
SRCREV_machine_pn-linux-yocto_fishriver ?= "0e3c3904bae04ef13db4049577d9512f7d0e6fa5"
SRCREV_meta_pn-linux-yocto_fishriver ?= "ceb1744ec55408cb637929a3f154379e42642890"

-SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
-SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
+SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
+SRCREV_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 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

-COMPATIBLE_MACHINE_fishriver = "crownbay"
-KMACHINE_fishriver = "crownbay"
+COMPATIBLE_MACHINE_fishriver = "fishriver"
+KMACHINE_fishriver = "fishriver"

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 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_fishriver = "fishriver"
-# zzzz /yocto/standard/crownbay->fishriver
-KMACHINE_fishriver = "yocto/standard/crownbay"
+KMACHINE_fishriver = "yocto/standard/fishriver"
--
1.7.0.4

Join yocto@lists.yoctoproject.org to automatically receive all group messages.