From 733ce0308bb2287643391f19a3a62728925f8726 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 2 Sep 2007 17:27:11 +0000 Subject: conf/machine: Various tweaks from Poky --- conf/machine/include/qemu.inc | 7 +++++-- conf/machine/include/zaurus-2.6.inc | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'conf/machine/include') 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" -- cgit v1.2.3