From 9ee1fbb72042e874b57c64949ebffbd696427b22 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 9 Jul 2010 14:27:48 +0100
Subject: qemu machines: Switch to use linux-wrs

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/machine/include/qemu.inc | 2 +-
 meta/conf/machine/qemuarm.conf     | 4 ++--
 meta/conf/machine/qemumips.conf    | 4 ++--
 meta/conf/machine/qemuppc.conf     | 2 +-
 meta/conf/machine/qemux86.conf     | 5 ++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index fc34c87fb0..607002aa94 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -15,4 +15,4 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000"
 RDEPENDS_kernel-base = ""
 
 # Use a common kernel recipe for all QEMU machines
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index b3fff3e8da..400ecc8245 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: qemu ARM Emulator setup
-#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
+#@NAME: arm_versaile_926ejs
+#@DESCRIPTION: arm_versaile_926ejs
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index 4cba267884..1f330e0d59 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: qemu MIPS (big-endian) Emulator setup
-#@DESCRIPTION: Machine configuration for running an MIPS r4k platform system under qemu emulation 
+#@NAME: mti_malta32_be MIPS
+#@DESCRIPTION: mti_malta32_be
 
 TARGET_ARCH = "mips"
 
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index 6ca8ce8d26..0bbeac7da6 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "ppc603e"
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-ppc603e.inc
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 462743a639..cb2a32d7bd 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -1,12 +1,11 @@
 #@TYPE: Machine
-#@NAME: qemu x86 Emulator setup
-#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for running a common x86
 
 TARGET_ARCH = "i586"
 PACKAGE_EXTRA_ARCHS = "x86"
 
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-- 
cgit v1.2.3-54-g00ecf