diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2010-02-14 01:19:08 +0100 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2010-02-14 01:19:08 +0100 |
| commit | 45f82a941c77e9d747814fa1e337ba803475d327 (patch) | |
| tree | 707b6edc2907dc83061972425f1d2ee7459a44a5 /conf | |
| parent | 860e9c92702c0551f397d3fab0a8e404fad4dbe5 (diff) | |
zaurus-kernels: move the kernel size check to linux-kexecboot.inc.
* no need for DONT_CHECK_KERNELSIZE
* clean up the affected files
* check happens only if KERNEL_IMAGE_MAXSIZE is set
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/initramfs-kexecboot.inc | 7 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-kernel.inc | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc index 6ee1ddc3fa..e59c4a2f59 100644 --- a/conf/machine/include/initramfs-kexecboot.inc +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -4,10 +4,7 @@ MACHINE_FEATURES_append = " kexecboot " EXTRA_IMAGEDEPENDS += "linux-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 nand for booting other kernels -DONT_CHECK_KERNELSIZE ?= "1" +# Include kernel in the rootfs (to be launched by kexec) +RDEPENDS_kernel-base = "kernel-image" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc index 1ba4a3422d..bbbb38315c 100644 --- a/conf/machine/include/zaurus-kernel.inc +++ b/conf/machine/include/zaurus-kernel.inc @@ -4,13 +4,12 @@ MACHINE_KERNEL_VERSION = "2.6" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -# Starting with 2.6.32 linux-rp is deprecated +# Starting with 2.6.32 linux-rp is deprecated for some models #PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/kernel_collie = "linux" PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" -KERNEL_IMAGE_MAXSIZE = "1294336" -KERNEL_IMAGE_MAXSIZE_collie = "1048576" - +# Default bootloader expects "zImage", use "uImage" for u-boot +# Note: kexecboot can boot both kind of images ZAURUS_KERNEL_IMAGETYPE ?= "zImage" KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" |