From d97fc15c8729c0a6bb53c1d0e05fc62fa3ef5d4f Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 1 Jun 2011 11:24:05 -0500 Subject: 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 --- meta-fishriver/README | 13 ------------- meta-fishriver/conf/machine/fishriver.conf | 4 ++-- .../recipes-kernel/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 1ffbbf1a..013f76e6 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 e562752f..861ca8b0 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 ?= "301ab1710d29a9bb931cb64c747d03da09dfea3f" SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" -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 dcc4534b..29399ba2 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 ba38dbee..eec65d8b 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" -- cgit v1.2.3-54-g00ecf