diff options
| author |   Richard Purdie <richard@openedhand.com> | 2007-08-29 19:36:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-29 19:36:40 +0000 |
| commit | e2b7975aa96f64f334755baa93fa2ba3eb6e4962 (patch) | |
| tree | d144a9e9683eb1f10e67bab42db33ad43e5d2cb5 /meta/conf | |
| parent | 5f17d07b014244bcff7f061e81ee00eef52c0937 (diff) | |
| download | openembedded-core-contrib-e2b7975aa96f64f334755baa93fa2ba3eb6e4962.tar.gz | |
conf/machine: Set KERNEL_IMAGE_TYPE and kernel-base RDEPENDS for various machines
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2599 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/htcuniversal.conf | 4 | ||||
| -rw-r--r-- | meta/conf/machine/hx2000.conf | 4 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 3 | ||||
| -rw-r--r-- | meta/conf/machine/include/zaurus-2.6.inc | 4 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86.conf | 2 |
6 files changed, 18 insertions, 1 deletions
diff --git a/meta/conf/machine/htcuniversal.conf b/meta/conf/machine/htcuniversal.conf index 922c13c0f5..86c1d0dbb5 100644 --- a/meta/conf/machine/htcuniversal.conf +++ b/meta/conf/machine/htcuniversal.conf @@ -26,3 +26,7 @@ module_autoload_acx = "acx" module_autoload_htcuniversal_acx = "htcuniversal_acx" IMAGE_FSTYPES ?= "tar.gz" + +# Don't include kernels in standard images for Zaurus machines +RDEPENDS_kernel-base = "" +KERNEL_IMAGETYPE = "zImage" diff --git a/meta/conf/machine/hx2000.conf b/meta/conf/machine/hx2000.conf index d7077af593..5a896c8f31 100644 --- a/meta/conf/machine/hx2000.conf +++ b/meta/conf/machine/hx2000.conf @@ -61,3 +61,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" + +# Don't include kernels in standard images for Zaurus machines +RDEPENDS_kernel-base = "" +KERNEL_IMAGETYPE = "zImage" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index ed8547867b..d84f1efb26 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -9,3 +9,6 @@ IMAGE_FSTYPES ?= "tar.bz2 ext2" ROOT_FLASH_SIZE = "230" IMAGE_ROOTFS_SIZE_ext2 ?= "230000" + +# Don't include kernels in standard images +RDEPENDS_kernel-base = "" diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc index 84221b54b0..efa1704642 100644 --- a/meta/conf/machine/include/zaurus-2.6.inc +++ b/meta/conf/machine/include/zaurus-2.6.inc @@ -44,4 +44,6 @@ zaurus_make_installkit () { rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ } -RDEPENDS_kernel-base = ""
\ No newline at end of file +# Don't include kernels in standard images for Zaurus machines +RDEPENDS_kernel-base = "" +KERNEL_IMAGETYPE = "zImage" diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 745928b252..6a2fe6feb9 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 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/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index db0eb1a966..2378a9990e 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/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" |