summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-10-23 08:15:40 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-10-23 08:15:40 +0000
commitca914bc4804bf812c1f61350f6487bc60f48b25a (patch)
treeb0be733764553b307c8b3dd6f71d5a608a4be97f /packages/linux
parent1298d6404cf24b1a441a553ebc7a104330ea3d54 (diff)
parent3f758c05135682e27e6fa1f4b85003e4a406510d (diff)
merge of '59cab1cf7e6555c78e83160548945b0b63b193a9'
and '5db403bd5d17402720832bf15a2ac01a04220cad'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-ezx_2.6.21.bb6
-rw-r--r--packages/linux/linux-rp_2.6.21.bb2
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index db561a7f0d..7ba2556bb8 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-PR = "${EZX}-r23"
+PR = "${EZX}-r24"
require linux.inc
@@ -92,8 +92,8 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
CMDLINE_CON = "console=tty1 "
-CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5"
-CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=1"
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=1 "
# Uncomment to enable dyntick
#CMDLINE_OTHER = "dyntick=enable"
CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index 3f155942e9..795e727ed3 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -2,6 +2,8 @@ require linux-rp.inc
PR = "r10"
+DEFAULT_PREFERENCE_collie = "1"
+
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
# http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2