11 files changed, 21 insertions, 14 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b1635c022c..92651f60f1 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index 50c6561a95..f52efc2aab 100644
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
 
 HOTPLUG = "udev"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index abc17728b5..6ccdc5070e 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -45,4 +45,5 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
+IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index ab532e33ff..4906f87e76 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -73,4 +73,5 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
 
+IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 7e2200853c..0a9f209fe2 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -2,7 +2,10 @@
 
 # NOTE: include this file after zaurus-2.6.inc for zaurus machines
 
-MACHINE_FEATURES_append = "kexecboot"
+MACHINE_FEATURES_append = " kexecboot "
+
+IMAGE_FSTYPES += " tar.gz "
+EXTRA_IMAGEDEPENDS += "linux-kexecboot"
 
 # Include Kernel image in kexecboot enabled images
 RDEPENDS_kernel-base = "kernel-image" 
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 296ce6a2ed..fe28a3cb4d 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel"
 
 #cat /proc/mtd
 #dev:    size   erasesize  name
diff --git a/conf/machine/include/tune-mips32.inc b/conf/machine/include/tune-mips32.inc
new file mode 100644
index 0000000000..93da66b158
--- /dev/null
+++ b/conf/machine/include/tune-mips32.inc
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-march=mips32"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index eee7631018..8fb36f78be 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -79,7 +79,6 @@ zaurus_make_installkit () {
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
 }
 
-# Don't include kernels in standard images for Zaurus machines
-RDEPENDS_kernel-base = ""
-
 KERNEL_IMAGETYPE ?= "zImage"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index c7c81c9f9a..4e8f011a1e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-xscale.inc
 
 IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/stb225.conf b/conf/machine/stb225.conf
index 97370e1fe8..c57adb09f8 100644
--- a/conf/machine/stb225.conf
+++ b/conf/machine/stb225.conf
@@ -1,8 +1,14 @@
 # PNX8335 STB225 board
+
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH="-march=mips32"
+
 MACHINE_FEATURES = "kernel26"
-IMAGE_FSTYPES="tar.gz"
-PREFERRED_PROVIDER_virtual/kernel="linux"
-KERNEL_IMAGETYPE="vmlinux"
-KERNEL_OUTPUT="${KERNEL_IMAGETYPE}"
+
+IMAGE_FSTYPES += "tar.gz"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+KERNEL_IMAGETYPE = "uImage"
+
+SERIAL_CONSOLE ?= "115200 ttySA0"
+
+require conf/machine/include/tune-mips32.inc
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index edea47a2d4..593ceab33d 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,7 +4,6 @@
 
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
-require conf/machine/include/kexecboot.inc
 
 IMAGE_FSTYPES += "jffs2 tar.gz"