40 files changed, 106 insertions, 65 deletions
diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.inc
index d0100c9968..d0100c9968 100644
--- a/conf/machine/include/LAB-settings.conf
+++ b/conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.inc
index eed8de9ab9..eed8de9ab9 100644
--- a/conf/machine/include/collie-2.4.conf
+++ b/conf/machine/include/collie-2.4.inc
diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.inc
index f22ffce6c2..f22ffce6c2 100644
--- a/conf/machine/include/collie-2.6.conf
+++ b/conf/machine/include/collie-2.6.inc
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
new file mode 100644
index 0000000000..fc5fd4e136
--- /dev/null
+++ b/conf/machine/include/gumstix.inc
@@ -0,0 +1,48 @@
+#@TYPE: Machine
+#@Name: Gumstix pxa2xx boards
+#@DESCRIPTION:  Gumstix pxa2xx boards
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+KERNEL_IMAGETYPE = "uImage"
+
+module_autoload_pxamci = "pxamci"
+module_autoload_mmc_block = "mmc_block"
+module_autoload_gumstix_gadget = "gumstix_gadget"
+module_autoload_g_ether = "g_ether"
+module_autoload_smc91x = "smc91x"
+module_autoload_smc911x = "smc911x"
+
+UBOOT_ENTRYPOINT = "a0008000"
+
+#Assume people have some gumstix extension boards 
+MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
+
+# Install all kernel modules
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# Install only selected kernel modules, comment out line above also
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
+                             kernel-module-rtc-core \
+                             kernel-module-rtc-dev \
+                             kernel-module-rtc-proc \
+                             kernel-module-rtc-sa1100 \
+                             kernel-module-rtc-sysfs \
+                             kernel-module-smc91x \
+                             kernel-module-gumstix-smc91x \
+                             kernel-module-smc911x \
+                             kernel-module-gumstix-smc911x \
+                             "
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+
+#don't try to access tty1
+USE_VT = "0"
+
+require conf/machine/include/tune-xscale.inc
+
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.inc
index 6f0d5b20eb..175ec80e6a 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.inc
@@ -10,8 +10,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
 
-require conf/machine/include/tune-xscale.conf
-require conf/machine/include/tune-thumb.conf
+require conf/machine/include/tune-xscale.inc
+require conf/machine/include/tune-thumb.inc
 
 #-------------------------------------------------------------------------------
 # Board defaults
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.inc
index 064db79b29..632a9ed4cc 100644
--- a/conf/machine/include/lsppc.conf
+++ b/conf/machine/include/lsppc.inc
@@ -23,4 +23,4 @@ IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 IMAGE_FSTYPES = "tar.gz"
 
 #tune for the MPC5200B cpu
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index c1eac82e3b..87571c0db0 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -1,12 +1,9 @@
-
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
 #cat /proc/mtd
 #dev:    size   erasesize  name
 #mtd0: 00020000 00008000 "Bootloader"
@@ -15,19 +12,28 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 #mtd3: 00020000 00020000 "Logo"
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
 
-#the EZX phones need a userspace daemon to stop the BP from shutting down the phone 
-MACHINE_EXTRA_RDEPENDS += "opentapi"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "180"
 
 ROOT_FLASH_SIZE = "24"
 
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
 EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
 
-# Opentapi needs to be started very early so we need the mux devices in static /dev
+# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd"
+
+# Ezxd needs to be started very early so we need the mux devices in static /dev
 IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
                        files/device_table-ezx.txt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.conf
deleted file mode 100644
index e87f6aa70f..0000000000
--- a/conf/machine/include/motorola-ezx.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# choose the proper kernel for this hardware
-PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels"
-# we don't need support for kernel 2.4
-MODUTILS = "26"
-# build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd
-IMAGE_FSTYPES = "tar.gz jffs2"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools"
-
-#
-# disable all modules until we have something that boots...
-#
-
-# Ethernet modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-#                              kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-#                              kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-#
-# USB Gadget Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-#                             kernel-module-g-serial kernel-module-g-ether"
-#
-# Sound Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-#BOOTSTRAP_EXTRA_SOUND     = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc 
-#                              kernel-module-snd-timer kernel-module-snd-pcm  \
-#                              kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-#                             
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.inc
index 821ebc4c03..5eb7806f6f 100644
--- a/conf/machine/include/palm.conf
+++ b/conf/machine/include/palm.inc
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
 
@@ -57,7 +57,7 @@ module_autoload_snd-timer = "snd-timer"
 module_autoload_soundcore = "soundcore"
 module_autoload_wm97xx-ts = "wm97xx-ts"
 module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
-module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmtx_battery = "palmtx_battery"
 module_autoload_palmz72_battery = "palmz72_battery"
 module_autoload_i2c-dev = "i2c-dev"
 module_autoload_i2c-pxa = "i2c-pxa"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.inc
index fa24a3281b..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.inc
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.inc
index 26b78a6a9d..d84f1efb26 100644
--- a/conf/machine/include/qemu.conf
+++ b/conf/machine/include/qemu.inc
@@ -7,5 +7,8 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
 
 IMAGE_FSTYPES ?= "tar.bz2 ext2"
 
-ROOT_FLASH_SIZE = "200"
-IMAGE_ROOTFS_SIZE_ext2 = "200000"
+ROOT_FLASH_SIZE = "230"
+IMAGE_ROOTFS_SIZE_ext2 ?= "230000"
+
+# Don't include kernels in standard images
+RDEPENDS_kernel-base = ""
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.inc
index 06f12f532f..06f12f532f 100644
--- a/conf/machine/include/simpad-2.4.conf
+++ b/conf/machine/include/simpad-2.4.inc
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.inc
index e485c7bf2a..e485c7bf2a 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.inc
diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.inc
index 68316f36bf..a69df825c0 100644
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ b/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
-PACKAGE_ARCH = "armv6"
-\ No newline at end of file
+FEED_ARCH = "armv6"
+PACKAGE_ARCH = "armv6"
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.inc
index 373bf46727..b142d3325a 100644
--- a/conf/machine/include/tune-arm920t.conf
+++ b/conf/machine/include/tune-arm920t.inc
@@ -1,3 +1,4 @@
+FEED_ARCH = "armv4t"
 PACKAGE_ARCH = "armv4t" 
 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
 
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.inc
index 31fe8868ca..c3e8d7aefc 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.inc
@@ -1,3 +1,5 @@
+FEED_ARCH = "armv5te"
+
 # For gcc 3.x you need:
 #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 # For gcc 4.x you need:
diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.inc
index d097b07739..d097b07739 100644
--- a/conf/machine/include/tune-arm9tdmi.conf
+++ b/conf/machine/include/tune-arm9tdmi.inc
diff --git a/conf/machine/include/tune-athlonmp.conf b/conf/machine/include/tune-athlonmp.inc
index b2d0e703db..b2d0e703db 100644
--- a/conf/machine/include/tune-athlonmp.conf
+++ b/conf/machine/include/tune-athlonmp.inc
diff --git a/conf/machine/include/tune-c3.conf b/conf/machine/include/tune-c3.inc
index e6a522af10..e6a522af10 100644
--- a/conf/machine/include/tune-c3.conf
+++ b/conf/machine/include/tune-c3.inc
diff --git a/conf/machine/include/tune-ep9312.conf b/conf/machine/include/tune-ep9312.inc
index 0982cf2a13..0982cf2a13 100644
--- a/conf/machine/include/tune-ep9312.conf
+++ b/conf/machine/include/tune-ep9312.inc
diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.conf
new file mode 100644
index 0000000000..335fadec6e
--- /dev/null
+++ b/conf/machine/include/tune-geodelx.conf
@@ -0,0 +1,6 @@
+# Geode CPU has it's own target in GCC 4.3
+# in older versions k6-2 is closest
+#
+TARGET_CC_ARCH = "-march=k6-2"
+PACKAGE_ARCH = "geode"
+
diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.inc
index 8376faca74..8376faca74 100644
--- a/conf/machine/include/tune-iwmmxt.conf
+++ b/conf/machine/include/tune-iwmmxt.inc
diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
new file mode 100644
index 0000000000..7b1a517895
--- /dev/null
+++ b/conf/machine/include/tune-pentium.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentium"
+PACKAGE_ARCH = "i586"
+
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
new file mode 100644
index 0000000000..aa9a8dfa1d
--- /dev/null
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentiumpro"
+PACKAGE_ARCH = "i686"
+
diff --git a/conf/machine/include/tune-ppc405.conf b/conf/machine/include/tune-ppc405.inc
index cf8f58c115..cf8f58c115 100644
--- a/conf/machine/include/tune-ppc405.conf
+++ b/conf/machine/include/tune-ppc405.inc
diff --git a/conf/machine/include/tune-ppc440.conf b/conf/machine/include/tune-ppc440.inc
index dff8dce684..dff8dce684 100644
--- a/conf/machine/include/tune-ppc440.conf
+++ b/conf/machine/include/tune-ppc440.inc
diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf
deleted file mode 100644
index 0cfa50c69e..0000000000
--- a/conf/machine/include/tune-ppc440e.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=440fp"
-PACKAGE_ARCH = "ppc440"
diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc
new file mode 100644
index 0000000000..5c47482a54
--- /dev/null
+++ b/conf/machine/include/tune-ppc440e.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440fp -mhard-float"
+PACKAGE_ARCH = "ppc440e"
diff --git a/conf/machine/include/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf
deleted file mode 100644
index 7c8714cfc2..0000000000
--- a/conf/machine/include/tune-ppc603e.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=603e"
-PACKAGE_ARCH = "ppc603e"
diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc
new file mode 100644
index 0000000000..1a004d30b5
--- /dev/null
+++ b/conf/machine/include/tune-ppc603e.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
+PACKAGE_ARCH = "ppc603e"
diff --git a/conf/machine/include/tune-ppce500.conf b/conf/machine/include/tune-ppce500.inc
index 11717eba70..11717eba70 100644
--- a/conf/machine/include/tune-ppce500.conf
+++ b/conf/machine/include/tune-ppce500.inc
diff --git a/conf/machine/include/tune-sh3.conf b/conf/machine/include/tune-sh3.inc
index 192dd8fd22..192dd8fd22 100644
--- a/conf/machine/include/tune-sh3.conf
+++ b/conf/machine/include/tune-sh3.inc
diff --git a/conf/machine/include/tune-sh4.conf b/conf/machine/include/tune-sh4.inc
index 866f7f89d5..866f7f89d5 100644
--- a/conf/machine/include/tune-sh4.conf
+++ b/conf/machine/include/tune-sh4.inc
diff --git a/conf/machine/include/tune-strongarm.conf b/conf/machine/include/tune-strongarm.inc
index 8654c996ef..8654c996ef 100644
--- a/conf/machine/include/tune-strongarm.conf
+++ b/conf/machine/include/tune-strongarm.inc
diff --git a/conf/machine/include/tune-supersparc.conf b/conf/machine/include/tune-supersparc.inc
index 1b1ec1207f..1b1ec1207f 100644
--- a/conf/machine/include/tune-supersparc.conf
+++ b/conf/machine/include/tune-supersparc.inc
diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.inc
index a25cb5320c..a25cb5320c 100644
--- a/conf/machine/include/tune-thumb.conf
+++ b/conf/machine/include/tune-thumb.inc
diff --git a/conf/machine/include/tune-x86-nocona.inc b/conf/machine/include/tune-x86-nocona.inc
new file mode 100644
index 0000000000..f1189a171e
--- /dev/null
+++ b/conf/machine/include/tune-x86-nocona.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=nocona"
+TARGET_CC_KERNEL_ARCH = "-march=nocona"
diff --git a/conf/machine/include/tune-x86-prescott.inc b/conf/machine/include/tune-x86-prescott.inc
new file mode 100644
index 0000000000..f3ec4e956a
--- /dev/null
+++ b/conf/machine/include/tune-x86-prescott.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=prescott"
+TARGET_CC_KERNEL_ARCH = "-march=prescott"
diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.inc
index 1d212946e4..f14aee9aed 100644
--- a/conf/machine/include/tune-xscale.conf
+++ b/conf/machine/include/tune-xscale.inc
@@ -1,3 +1,5 @@
+FEED_ARCH = "armv5te"
+
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
 PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index a9702cfce2..979a6bd484 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -1,5 +1,5 @@
 # Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.conf as well
+# Don't forget to include zaurus-clamshell.inc as well
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
@@ -11,14 +11,12 @@ ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
 
-IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
-IMAGE_FSTYPES ?= "jffs2 tar.gz"
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+include conf/machine/include/tune-xscale.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -39,6 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
 GUI_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS_collie = "smallscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
@@ -67,3 +66,7 @@ zaurus_make_installkit () {
     md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
 }
+
+# Don't include kernels in standard images for Zaurus machines
+RDEPENDS_kernel-base = ""
+KERNEL_IMAGETYPE = "zImage"