From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 3 Aug 2008 01:14:03 +0000 (+0000)
Subject: zaurus-2.6.inc: commit attachment 9873 from bug 3738
X-Git-Tag: Release-2010-05/1~6377
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=102eafc24be4bc751c01cdff6dc3defae047f914;p=openembedded.git

zaurus-2.6.inc: commit attachment 9873 from bug 3738
* it seems this bug will lead to many changes, let's break them down one by one
  this particular change seems to be be low on f*ck-up potential
* define preferred provider of virtual/xserver for c7x0 machine
* weakly assign KERNEL_IMAGETYPE
---

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 4bea25a0ed..c16707be84 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -19,6 +19,7 @@ SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
@@ -80,4 +81,4 @@ zaurus_make_installkit () {
 RDEPENDS_kernel-base = ""
 # collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it.
 RDEPENDS_kernel-base_collie = "kernel-image" 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE ?= "zImage"