[oe-commits] Andrea Adami : zaurus-kernels: move the kernel size check to linux-kexecboot.inc.
git version control
git at git.openembedded.org
Sun Feb 14 00:25:09 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 45f82a941c77e9d747814fa1e337ba803475d327
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=45f82a941c77e9d747814fa1e337ba803475d327
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Sun Feb 14 01:19:08 2010 +0100
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
---
classes/kernel.bbclass | 2 +-
conf/machine/include/initramfs-kexecboot.inc | 7 ++-----
conf/machine/include/zaurus-kernel.inc | 7 +++----
recipes/kexecboot/linux-kexecboot.inc | 4 +++-
recipes/preboot/linux-preboot.inc | 1 -
5 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 39ff928..d4ecf72 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -497,7 +497,7 @@ python populate_packages_prepend () {
# Support checking the kernel size since some kernels need to reside in partitions
# with a fixed length or there is a limit in transferring the kernel to memory
do_sizecheck() {
- if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then
+ if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
rm ${KERNEL_OUTPUT}
diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
index 6ee1ddc..e59c4a2 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 1ba4a34..bbbb383 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}"
diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc
index 82f2c53..a241be8 100644
--- a/recipes/kexecboot/linux-kexecboot.inc
+++ b/recipes/kexecboot/linux-kexecboot.inc
@@ -6,7 +6,6 @@ SRC_URI = "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2"
require ../linux/linux.inc
-DONT_CHECK_KERNELSIZE = ""
INITRAMFS_IMAGE = "initramfs-kexecboot-image"
# here we set master console on serial
@@ -26,6 +25,9 @@ BASRC = "http://www.orca.cx/zaurus/patches"
CHSRC = "http://oz.drigon.com/patches"
TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
+KERNEL_IMAGE_MAXSIZE = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+
KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}"
KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}"
diff --git a/recipes/preboot/linux-preboot.inc b/recipes/preboot/linux-preboot.inc
index 56a90a9..d8771f8 100644
--- a/recipes/preboot/linux-preboot.inc
+++ b/recipes/preboot/linux-preboot.inc
@@ -5,7 +5,6 @@ LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga"
require ../linux/linux.inc
-DONT_CHECK_KERNELSIZE = ""
INITRAMFS_IMAGE = "initramfs-preboot-image"
# here we set master console on serial
More information about the Openembedded-commits
mailing list