From: Michael Lauer Date: Sat, 15 Sep 2007 18:46:39 +0000 (+0000) Subject: merge of '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c' X-Git-Tag: Release-2010-05/1~8625^2~102 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c075092edae2d22978580fc9c1cebdd4fefd1a;p=openembedded.git Merge ... '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c' and 'a3ee5d88f6d1100cd285c2fead8e37018bd42a9f' --- 76c075092edae2d22978580fc9c1cebdd4fefd1a diff --cc packages/linux/linux-ezx_2.6.21.bb index edca1ed1c9,cf0f246ecc..d74a22b652 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@@ -1,8 -1,12 +1,9 @@@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680" -SECTION = "kernel" -AUTHOR = "Harald Welte and the OpenEZX Team " +AUTHOR = "The OpenEZX Team " HOMEPAGE = "http://www.openezx.org" -LICENSE = "GPL" EZX = "ezxdev" - PR = "${EZX}-r13" + PR = "${EZX}-r15" + -inherit kernel require linux.inc @@@ -76,9 -83,11 +80,10 @@@ COMPATIBLE_MACHINE = '(a780|e680|a1200| # For now the code for serial console is disabled in compress.c #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 " CMDLINE_CON = "console=tty1 " + CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5" -# uncomment if you want to boot over NFS -#CMDLINE_ROOT = "root=301 root=/dev/nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 " -# uncomment to enable dyntick +CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 " +# Uncomment to enable dyntick #CMDLINE_OTHER = "dyntick=enable" CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' CMDLINE_IP = "ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0" @@@ -95,3 -98,16 +100,4 @@@ KERNEL_IMAGE_MAXSIZE = "1294336 # #module_autoload_pxaficp_ir = "pxaficp_ir" #module_autoload_snd-pcm-oss = "snd-pcm-oss" + -############################################################### -# check the kernel is below the 1024*1024 byte limit for the boot-over usb -# -do_compile_append() { - 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" - echo "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular." - fi -} -