Date   

Re: [PATCH 0/2][KERNEL] meta-intel: fishriver updates

Tom Zanussi <tom.zanussi@...>
 

On Thu, 2011-06-02 at 22:02 -0700, Bruce Ashfield wrote:
On 11-06-01 6:05 PM, tom.zanussi@... wrote:
From: Tom Zanussi<tom.zanussi@...>

This patchset adds an ericsson 3g feature and also creates a separate
bsp for fishriver, which had previously been hijacking crownbay.

Please pull into linux-yocto-2.6.37.
Merged, and also propp'd to the -dev kernel.

Changes will be pushed out in the morning, I have a few
other pending merges to take care of at the same time.
Thanks, Bruce.

Tom

Cheers,

Bruce


Pull URL: git://git.yoctoproject.org/linux-yocto-2.6.37-contrib
Branch: tzanussi/yocto/standard/fishriver
Browse: http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/yocto/standard/fishriver

Tom Zanussi (2):
meta: add ericsson-3g f5521gw feature
meta/fishriver: create initial BSP infrastructure

meta/cfg/kernel-cache/bsp/fishriver/eg20t.cfg | 39 +++++++++++
.../bsp/fishriver/fishriver-standard.scc | 7 ++
meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg | 69 ++++++++++++++++++++
meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc | 15 ++++
.../kernel-cache/features/ericsson-3g/f5521gw.cfg | 3 +
.../kernel-cache/features/ericsson-3g/f5521gw.scc | 3 +
6 files changed, 136 insertions(+), 0 deletions(-)
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/eg20t.cfg
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/fishriver-standard.scc
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc
create mode 100644 meta/cfg/kernel-cache/features/ericsson-3g/f5521gw.cfg
create mode 100644 meta/cfg/kernel-cache/features/ericsson-3g/f5521gw.scc


Re: [PATCH 0/2][KERNEL] meta-intel: fishriver updates

Bruce Ashfield <bruce.ashfield@...>
 

On 11-06-01 6:05 PM, tom.zanussi@... wrote:
From: Tom Zanussi<tom.zanussi@...>

This patchset adds an ericsson 3g feature and also creates a separate
bsp for fishriver, which had previously been hijacking crownbay.

Please pull into linux-yocto-2.6.37.
Merged, and also propp'd to the -dev kernel.

Changes will be pushed out in the morning, I have a few
other pending merges to take care of at the same time.

Cheers,

Bruce


Pull URL: git://git.yoctoproject.org/linux-yocto-2.6.37-contrib
Branch: tzanussi/yocto/standard/fishriver
Browse: http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/yocto/standard/fishriver

Tom Zanussi (2):
meta: add ericsson-3g f5521gw feature
meta/fishriver: create initial BSP infrastructure

meta/cfg/kernel-cache/bsp/fishriver/eg20t.cfg | 39 +++++++++++
.../bsp/fishriver/fishriver-standard.scc | 7 ++
meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg | 69 ++++++++++++++++++++
meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc | 15 ++++
.../kernel-cache/features/ericsson-3g/f5521gw.cfg | 3 +
.../kernel-cache/features/ericsson-3g/f5521gw.scc | 3 +
6 files changed, 136 insertions(+), 0 deletions(-)
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/eg20t.cfg
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/fishriver-standard.scc
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg
create mode 100644 meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc
create mode 100644 meta/cfg/kernel-cache/features/ericsson-3g/f5521gw.cfg
create mode 100644 meta/cfg/kernel-cache/features/ericsson-3g/f5521gw.scc


Re: [PATCH 0/2][KERNEL] Add Ericsson 3G patches

Bruce Ashfield <bruce.ashfield@...>
 

On 11-06-01 6:03 PM, tom.zanussi@... wrote:
From: Tom Zanussi<tom.zanussi@...>

This patchset adds the kernel patches needed for Ericsson 3G support,
needed by fishriver.

Please pull into linux-yocto-2.6.37.
Merged. I dropped these onto yocto/standard so any new
BSPs can leverage them as well.

Changes will be pushed out in the morning, I have a few
other pending merges to take care of at the same time.

Cheers,

Bruce


Pull URL: git://git.yoctoproject.org/linux-yocto-2.6.37-contrib
Branch: tzanussi/fishriver-3g
Browse: http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/fishriver-3g

Alexey Orishko (2):
usbnet: changes for upcoming cdc_ncm driver
USB CDC NCM host driver

drivers/net/usb/Kconfig | 19 +
drivers/net/usb/Makefile | 1 +
drivers/net/usb/cdc_ncm.c | 1213 ++++++++++++++++++++++++++++++++++++++++++++
drivers/net/usb/usbnet.c | 45 ++-
include/linux/usb/usbnet.h | 6 +
5 files changed, 1270 insertions(+), 14 deletions(-)
create mode 100644 drivers/net/usb/cdc_ncm.c


Re: yoctoproject.org down?

Cui, Dexuan <dexuan.cui@...>
 

I'm from PRC and when I try to access the site via https, I also get the mysterious "Drupal" page: (http works for me and only https has the issue) :
 
 
 
 
Thanks,
-- Dexuan



From: yocto-bounces@... [mailto:yocto-bounces@...] On Behalf Of Osier-mixon, Jeffrey
Sent: 2011年6月3日 3:29
To: Joshua Lock
Cc: yocto@...
Subject: Re: [yocto] yoctoproject.org down?

If I go there via https I get the EULA download page.  Very odd.  Something for our new sysadmin to take a look at someday.

On Thu, Jun 2, 2011 at 11:22 AM, Joshua Lock <josh@...> wrote:
On Thu, 2011-06-02 at 11:18 -0700, Jeffrey Osier-Mixon wrote:
> Someone else mentioned it being down a day or two ago as showing up with
> an unadorned Drupal page, unverified.

Is this a simple case of https://www.yoctoproject.org vs
http://www.yoctoproject.org ?

Trying to access the site via https gives you a drupal "Site off-line"
page.

Joshua
--
Joshua Lock
       Yocto Build System Monkey
       Intel Open Source Technology Centre

_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto


Re: yoctoproject.org down?

Darren Hart <dvhart@...>
 

On 06/02/2011 02:24 PM, Cherry, John wrote:
My issues were not https vs http. Just intermittent access. I can access the site now.
Same here.


-----Original Message-----
From: yocto-bounces@... [mailto:yocto-
bounces@...] On Behalf Of Joshua Lock
Sent: Thursday, June 02, 2011 11:23 AM
To: yocto@...
Subject: Re: [yocto] yoctoproject.org down?

On Thu, 2011-06-02 at 11:18 -0700, Jeffrey Osier-Mixon wrote:
Someone else mentioned it being down a day or two ago as showing up
with
an unadorned Drupal page, unverified.
Is this a simple case of https://www.yoctoproject.org vs
http://www.yoctoproject.org ?

Trying to access the site via https gives you a drupal "Site off-line"
page.

Joshua
--
Joshua Lock
Yocto Build System Monkey
Intel Open Source Technology Centre

_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto
_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel


Re: yoctoproject.org down?

Cherry, John <John_Cherry@...>
 

My issues were not https vs http. Just intermittent access. I can access the site now.

-----Original Message-----
From: yocto-bounces@... [mailto:yocto-
bounces@...] On Behalf Of Joshua Lock
Sent: Thursday, June 02, 2011 11:23 AM
To: yocto@...
Subject: Re: [yocto] yoctoproject.org down?

On Thu, 2011-06-02 at 11:18 -0700, Jeffrey Osier-Mixon wrote:
Someone else mentioned it being down a day or two ago as showing up
with
an unadorned Drupal page, unverified.
Is this a simple case of https://www.yoctoproject.org vs
http://www.yoctoproject.org ?

Trying to access the site via https gives you a drupal "Site off-line"
page.

Joshua
--
Joshua Lock
Yocto Build System Monkey
Intel Open Source Technology Centre

_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto


Re: yoctoproject.org down?

Osier-mixon, Jeffrey <jeffrey.osier-mixon@...>
 

If I go there via https I get the EULA download page.  Very odd.  Something for our new sysadmin to take a look at someday.


On Thu, Jun 2, 2011 at 11:22 AM, Joshua Lock <josh@...> wrote:
On Thu, 2011-06-02 at 11:18 -0700, Jeffrey Osier-Mixon wrote:
> Someone else mentioned it being down a day or two ago as showing up with
> an unadorned Drupal page, unverified.

Is this a simple case of https://www.yoctoproject.org vs
http://www.yoctoproject.org ?

Trying to access the site via https gives you a drupal "Site off-line"
page.

Joshua
--
Joshua Lock
       Yocto Build System Monkey
       Intel Open Source Technology Centre

_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto


Re: yoctoproject.org down?

Joshua Lock <josh@...>
 

On Thu, 2011-06-02 at 11:18 -0700, Jeffrey Osier-Mixon wrote:
Someone else mentioned it being down a day or two ago as showing up with
an unadorned Drupal page, unverified.
Is this a simple case of https://www.yoctoproject.org vs
http://www.yoctoproject.org ?

Trying to access the site via https gives you a drupal "Site off-line"
page.

Joshua
--
Joshua Lock
Yocto Build System Monkey
Intel Open Source Technology Centre


Re: yoctoproject.org down?

Jeffrey Osier-Mixon <jefro.net@...>
 

Someone else mentioned it being down a day or two ago as showing up with an unadorned Drupal page, unverified.

It must be intermittent, and I must always hit it when it works. Seems to be working now (11:18am PDT).


Re: yoctoproject.org down?

Darren Hart <darren.hart@...>
 

On 06/02/2011 08:14 AM, Cherry, John wrote:
Thanks. Must be something on my side.



*From:*Rifenbark, Scott M [mailto:scott.m.rifenbark@...]
*Sent:* Thursday, June 02, 2011 7:54 AM
*To:* Cherry, John; yocto@...
*Subject:* RE: yoctoproject.org down?



http://www.yoctoproject.org is working for me at the moment.
I had some trouble from home today, and other have reported ssh to check
git perms hasn't been working as well. I wonder if we're seeing some ip
subnet blocking or something similar (just thinking out loud).

--
Darren




Scott



*From:*yocto-bounces@...
[mailto:yocto-bounces@...] *On Behalf Of *Cherry, John
*Sent:* Thursday, June 02, 2011 7:51 AM
*To:* yocto@...
*Subject:* [yocto] yoctoproject.org down?



Is the Yocto site down right now?



*John Cherry*| Sr Engineering Manager, Mentor Embedded Linux

Mentor Embedded <http://www.mentor.com/embedded>™

P 503.685.5412 | M 503.467.9649

Nucleus <http://www.mentor.com/embedded-software/nucleus/>®| Linux
<http://www.mentor.com/embedded-software/linux/>®| Android
<http://www.mentor.com/embedded-software/android/>™| Services
<http://www.mentor.com/embedded-software/services/> | UI
<http://www.mentor.com/embedded-software/inflexion/> | Multi-OS
<http://www.mentor.com/embedded-software/multicore-multi-os>



Android is a trademark of Google Inc. Use of this trademark is subject
to Google Permissions.

Linux is the registered trademark of Linus Torvalds in the U.S. and
other countries.





_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto

--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel


Re: [PATCH 0/2] meta-intel: minor layer fixes

Tom Zanussi <tom.zanussi@...>
 

On Thu, 2011-06-02 at 07:32 -0700, Paul Eggleton wrote:
A couple of minor things I uncovered whilst working on the layer tools.

Paul Eggleton (2):
meta-emenlow: remove obsolete bbappends
meta-crownbay: tidy up layer configuration

meta-crownbay/conf/layer.conf | 6 +-----
.../clutter/clutter-1.4_1.4.2.bbappend | 4 ----
.../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend | 2 --
3 files changed, 1 insertions(+), 11 deletions(-)
delete mode 100644 meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
delete mode 100644 meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend
Acked-by: Tom Zanussi <tom.zanussi@...>

Applied to meta-intel/master.

Thanks, Paul!


Re: yoctoproject.org down?

Cherry, John <John_Cherry@...>
 

Thanks.  Must be something on my side.

 

From: Rifenbark, Scott M [mailto:scott.m.rifenbark@...]
Sent: Thursday, June 02, 2011 7:54 AM
To: Cherry, John; yocto@...
Subject: RE: yoctoproject.org down?

 

http://www.yoctoproject.org is working for me at the moment.

 

Scott

 

From: yocto-bounces@... [mailto:yocto-bounces@...] On Behalf Of Cherry, John
Sent: Thursday, June 02, 2011 7:51 AM
To: yocto@...
Subject: [yocto] yoctoproject.org down?

 

Is the Yocto site down right now?

 

John Cherry | Sr Engineering Manager, Mentor Embedded Linux

Mentor Embedded

P 503.685.5412 | M 503.467.9649

Nucleus® | Linux® | Android | Services | UI | Multi-OS

 

Android is a trademark of Google Inc. Use of this trademark is subject to Google Permissions.

Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.

 


Re: yoctoproject.org down?

Rifenbark, Scott M <scott.m.rifenbark@...>
 

http://www.yoctoproject.org is working for me at the moment.

 

Scott

 

From: yocto-bounces@... [mailto:yocto-bounces@...] On Behalf Of Cherry, John
Sent: Thursday, June 02, 2011 7:51 AM
To: yocto@...
Subject: [yocto] yoctoproject.org down?

 

Is the Yocto site down right now?

 

John Cherry | Sr Engineering Manager, Mentor Embedded Linux

Mentor Embedded

P 503.685.5412 | M 503.467.9649

Nucleus® | Linux® | Android | Services | UI | Multi-OS

 

Android is a trademark of Google Inc. Use of this trademark is subject to Google Permissions.

Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.

 


Re: yoctoproject.org down?

Gary Thomas
 

On 06/02/2011 08:50 AM, Cherry, John wrote:
Is the Yocto site down right now?
Works for me (from US)

--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------


yoctoproject.org down?

Cherry, John <John_Cherry@...>
 

Is the Yocto site down right now?

 

John Cherry | Sr Engineering Manager, Mentor Embedded Linux

Mentor Embedded

P 503.685.5412 | M 503.467.9649

Nucleus® | Linux® | Android | Services | UI | Multi-OS

 

Android is a trademark of Google Inc. Use of this trademark is subject to Google Permissions.

Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.

 


[PATCH 2/2] meta-crownbay: tidy up layer configuration

Paul Eggleton
 

* We can't use machine overrides in layer.conf because MACHINE is not
defined yet (local.conf has not yet been parsed) so remove these
* In light of the above having a separate collection configured for
crownbay-noemgd no longer does anything, so remove it as well.

Signed-off-by: Paul Eggleton <paul.eggleton@...>
---
meta-crownbay/conf/layer.conf | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
index 4ffeb2c..9c3794b 100644
--- a/meta-crownbay/conf/layer.conf
+++ b/meta-crownbay/conf/layer.conf
@@ -7,10 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/../common/recipes-*/*/*.bb \
${LAYERDIR}/../common/recipes-*/*/*.bbappend"

-BBFILE_COLLECTIONS_append_crownbay += "crownbay"
+BBFILE_COLLECTIONS += "crownbay"
BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
BBFILE_PRIORITY_crownbay = "6"
-
-BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
-BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
-BBFILE_PRIORITY_crownbay-noemgd = "6"
--
1.7.4.1


[PATCH 1/2] meta-emenlow: remove obsolete bbappends

Paul Eggleton
 

Qt 4.6.3 and Clutter 1.4 have been removed from oe-core / poky.

Signed-off-by: Paul Eggleton <paul.eggleton@...>
---
.../clutter/clutter-1.4_1.4.2.bbappend | 4 ----
.../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend | 2 --
2 files changed, 0 insertions(+), 6 deletions(-)
delete mode 100644 meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
delete mode 100644 meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend

diff --git a/meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend b/meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
deleted file mode 100644
index 71677ad..0000000
--- a/meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-DEPENDS_emenlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
-EXTRA_OECONF_emenlow = "${BASE_CONF} --with-flavour=glx"
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
-
diff --git a/meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend b/meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend
deleted file mode 100644
index 92eabf2..0000000
--- a/meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-QT_GLFLAGS_emenlow = "-opengl"
-
--
1.7.4.1


[PATCH 0/2] meta-intel: minor layer fixes

Paul Eggleton
 

A couple of minor things I uncovered whilst working on the layer tools.

Paul Eggleton (2):
meta-emenlow: remove obsolete bbappends
meta-crownbay: tidy up layer configuration

meta-crownbay/conf/layer.conf | 6 +-----
.../clutter/clutter-1.4_1.4.2.bbappend | 4 ----
.../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend | 2 --
3 files changed, 1 insertions(+), 11 deletions(-)
delete mode 100644 meta-emenlow/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
delete mode 100644 meta-emenlow/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend

--
1.7.4.1


Re: [PATCH 0/6] meta-intel: emgd updrade

Tom Zanussi <tom.zanussi@...>
 

On Wed, 2011-06-01 at 13:27 -0700, Darren Hart wrote:

On 06/01/2011 12:55 PM, tom.zanussi@... wrote:
From: Tom Zanussi <tom.zanussi@...>

This patchset upgrades emgd to 1.6 Gold.

The following changes since commit e94dba8309874a82a570db60223d18b2c723c3a5:
Darren Hart (1):
linux-yocto*: correct FILESEXTRAPATHS assignment in all layers

are available in the git repository at:

git://git.yoctoproject.org/meta-intel.git tzanussi/emgd-1.6-upgrade
http://git.yoctoproject.org/cgit.cgi//log/?h=tzanussi/emgd-1.6-upgrade

Tom Zanussi (6):
meta-crownbay: new recipe for emgd 1.6 driver binaries
meta-intel: add xserver-xf86-dri-lite_1.9.3 to common
meta-crownbay: add common to BBFILES
meta-crownbay: update crownbay.conf
meta-crownbay: remove obsolete graphics recipes
meta-crownbay: update README with new build instructions.
With the exception of the patch upstream fields and giving Scott R a
chance to review the README, these look good to me. With those addressed:

Acked-by: Darren Hart <dvhart@...>
Hi Darren,

Thanks for your comments. I've addressed them and pushed the result to
master.

Thanks,

Tom


[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