merge of '761183d571c60b5df965993faf1c23d3f933718b'

     and 'd52a54d5f2ae378fe03f9c8d4cfb66d2d6a45d41'

35 files changed, 15 insertions, 12 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
index 67fefd3835..afcec66c51 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -37,5 +37,5 @@ SERIAL_CONSOLE = "115200 ttyS0 vt100"
 #don't try to access tty1
 USE_VT = "0"
 
-require conf/machine/include/tune-xscale.conf
+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 42df7bfbb5..6baa6a50ba 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -32,6 +32,6 @@ 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.inc
index e87f6aa70f..e87f6aa70f 100644
--- a/conf/machine/include/motorola-ezx.conf
+++ b/conf/machine/include/motorola-ezx.inc
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.inc
index 5371016ea9..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"
 
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 a69df825c0..a69df825c0 100644
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ b/conf/machine/include/tune-arm1136jf-s.inc
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.inc
index b142d3325a..b142d3325a 100644
--- a/conf/machine/include/tune-arm920t.conf
+++ b/conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.inc
index c3e8d7aefc..c3e8d7aefc 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.inc
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-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-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.inc
index 5c47482a54..5c47482a54 100644
--- a/conf/machine/include/tune-ppc440e.conf
+++ b/conf/machine/include/tune-ppc440e.inc
diff --git a/conf/machine/include/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.inc
index 1a004d30b5..1a004d30b5 100644
--- a/conf/machine/include/tune-ppc603e.conf
+++ b/conf/machine/include/tune-ppc603e.inc
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.conf b/conf/machine/include/tune-x86-nocona.inc
index f1189a171e..f1189a171e 100644
--- a/conf/machine/include/tune-x86-nocona.conf
+++ b/conf/machine/include/tune-x86-nocona.inc
diff --git a/conf/machine/include/tune-x86-prescott.conf b/conf/machine/include/tune-x86-prescott.inc
index f3ec4e956a..f3ec4e956a 100644
--- a/conf/machine/include/tune-x86-prescott.conf
+++ b/conf/machine/include/tune-x86-prescott.inc
diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.inc
index f14aee9aed..f14aee9aed 100644
--- a/conf/machine/include/tune-xscale.conf
+++ b/conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 456555e51e..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"
@@ -15,10 +15,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DI
 
 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"
@@ -70,3 +69,4 @@ zaurus_make_installkit () {
 
 # Don't include kernels in standard images for Zaurus machines
 RDEPENDS_kernel-base = ""
+KERNEL_IMAGETYPE = "zImage"