conf/machine: Various tweaks from Poky

7 files changed, 17 insertions, 5 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index de94f560f9..06d5946523 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -6,5 +6,6 @@ require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
+IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc
index 26b78a6a9d..d84f1efb26 100644
--- a/conf/machine/include/qemu.inc
+++ 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/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 53f47d6221..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,8 +15,6 @@ 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.inc
 
@@ -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"
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index eee1edd53e..0fbd9d1578 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -4,4 +4,6 @@
 
 require conf/machine/include/zaurus-2.6.inc
 
+IMAGE_FSTYPES ?= "jffs2"
+
 ROOT_FLASH_SIZE = "22"
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 9ef4f8e113..4306a6b22d 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-arm926ejs.inc
 
+KERNEL_IMAGETYPE = "zImage"
+
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index db0eb1a966..2378a9990e 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -7,6 +7,8 @@ PACKAGE_EXTRA_ARCHS = "x86"
 
 require conf/machine/include/qemu.inc
 
+KERNEL_IMAGETYPE = "bzImage"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 83227ee0c4..d70db72f38 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,6 +4,8 @@
 
 require conf/machine/include/zaurus-2.6.inc
 
+IMAGE_FSTYPES ?= "jffs2"
+
 # newer kernels does not build
 PREFERRED_VERSION_linux-rp = "2.6.17"