diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 13:41:25 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 13:41:25 +0000 |
| commit | e53259c49ae2e2d1cf6a3f2c5ee34b06470bf96b (patch) | |
| tree | cc726d2a1aa1092f086b62bbd66d98fdd538c9fb /conf/machine/include | |
| parent | 7eb73dfd5a79abfb7efe71b897c3dbcda6e505f1 (diff) | |
conf/machine/include: add kexecboot.inc
kexecboot: create a new devicetable file
collie.conf, poodle.conf: use new kexecboot.inc
zaurus-2.6.inc: make do_installkit know about kexecboot
(based on work of hvontres)
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/kexecboot.inc | 15 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 9 |
2 files changed, 19 insertions, 5 deletions
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc new file mode 100644 index 0000000000..8158f3ca02 --- /dev/null +++ b/conf/machine/include/kexecboot.inc @@ -0,0 +1,15 @@ +# kexecboot specific config options + +# NOTE: include this file after zaurus-2.6.inc for zaurus machines + +MACHINE_FEATURES_append = "kexecboot" + +# Include Kernel image in kexecboot enabled images +RDEPENDS_kernel-base = "kernel-image" + +# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels +DONT_CHECK_KERNELSIZE ?= "1" + +IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt" +#add some device nodes for kexecboot +IMAGE_DEVICE_TABLES_append = " files/device_table-kexecboot.txt" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index c16707be84..5e8f34fad6 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -52,10 +52,10 @@ zaurus_make_installkit () { mkdir ${IMAGE_NAME}-installkit/ # Get the latest kernel using the zImage-<machine>.bin symlink - if [ "${MACHINE}" = "collie" ]; then - [ -f "zImage-${MACHINE}-kexecboot.bin" ] && cp zImage-${MACHINE}-kexecboot.bin ${IMAGE_NAME}-installkit/zImage + if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" ]; then + [ -f "zImage-kexecboot-${MACHINE}.bin" ] && cp zImage-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage # we need also tgz for mmc or cf cards - cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz + cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz else cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage fi @@ -79,6 +79,5 @@ zaurus_make_installkit () { # Don't include kernels in standard images for Zaurus machines RDEPENDS_kernel-base = "" -# collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it. -RDEPENDS_kernel-base_collie = "kernel-image" + KERNEL_IMAGETYPE ?= "zImage" |