diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-01-18 16:02:07 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-01-18 16:02:07 +0000 |
| commit | 00db59a7bf8e8b26556b68950e1263f6d6eddd57 (patch) | |
| tree | 06f95068a1d155f6b860d21e1230c2520260a6c4 | |
| parent | 37f36030e423d22a863f50a6fb2199e3bf02d2b0 (diff) | |
| parent | 64d42088012e1255aff3e7565bf08afbc8317335 (diff) | |
merge of '0a2c0b977acc12b551929c86418ebe390325056e'
and 'f72a0f688eea0a4559430f2d777a82a1324bd4d2'
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 3 | ||||
| -rw-r--r-- | packages/linux/linux-rp.inc | 24 | ||||
| -rw-r--r-- | packages/linux/linux.inc | 12 |
3 files changed, 3 insertions, 36 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index a0a71a2969..2037931803 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -37,6 +37,9 @@ GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_collie = "smallscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" +KERNEL_IMAGE_MAXSIZE = "1294336" +KERNEL_IMAGE_MAXSIZE_collie = "1048576" + MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" zaurus_make_installkit () { diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index 8f180164e0..4137b991d1 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -136,30 +136,6 @@ do_configure() { yes '' | oe_runmake oldconfig } -# Check the kernel is below the 1264*1024 byte limit for the PXA Zaurii -do_compile_append() { - case ${MACHINE} in - c7x0 | akita | poodle | spitz | tosa ) - size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` - if [ $size -ge 1294336 ]; then - rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} - echo "Size is $size" - die "This kernel is too big for your PXA Zaurus and will destroy data if you flash it. Please reduce the size of the kernel by making more of it modular." - fi - ;; - collie ) - size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` - if [ $size -ge 1048576 ]; then - rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} - echo "Size is $size" - die "This kernel is too big for your Collie and will not be flashed. Please reduce the size of the kernel by making more of it modular." - fi - ;; - *) - ;; - esac -} - do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME} diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 345a2bd021..0bfcff9771 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -99,18 +99,6 @@ do_configure_prepend() { yes '' | oe_runmake oldconfig } -# 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}" ]; then - size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` - if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then - rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} - die "This kernel (size=$size) is too big for your device. Please reduce the size of the kernel by making more of it modular." - fi - fi -} - UBOOT_ENTRYPOINT ?= "20008000" do_compile_append() { |