summaryrefslogtreecommitdiff
path: root/openembedded/packages/linux/linux-openzaurus.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-12-13 09:10:55 +0000
committerRichard Purdie <richard@openedhand.com>2005-12-13 09:10:55 +0000
commit8ddcda34fb2fd199b72ebfb16ad48e2bbf7add6b (patch)
treed51698d57a48c17fb90e62b255b82c670956b7a3 /openembedded/packages/linux/linux-openzaurus.inc
parent8fd58431099933596268fb47245e673cf55ce3c6 (diff)
downloadopenembedded-core-8ddcda34fb2fd199b72ebfb16ad48e2bbf7add6b.tar.gz
openembedded-core-8ddcda34fb2fd199b72ebfb16ad48e2bbf7add6b.tar.bz2
openembedded-core-8ddcda34fb2fd199b72ebfb16ad48e2bbf7add6b.tar.xz
openembedded-core-8ddcda34fb2fd199b72ebfb16ad48e2bbf7add6b.zip
Update to latest 2.6.15-rc5 kernel
git-svn-id: https://svn.o-hand.com/repos/poky@190 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/linux/linux-openzaurus.inc')
-rw-r--r--openembedded/packages/linux/linux-openzaurus.inc21
1 files changed, 14 insertions, 7 deletions
diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc
index cb43f5aef..c07cd4ce0 100644
--- a/openembedded/packages/linux/linux-openzaurus.inc
+++ b/openembedded/packages/linux/linux-openzaurus.inc
@@ -3,7 +3,7 @@ SECTION = "kernel"
MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
LICENSE = "GPL"
-DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
+DOSRC = "http://www.do13.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
BASRC = "http://www.orca.cx/zaurus/patches"
@@ -20,9 +20,10 @@ EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
COMPATIBLE_HOST = "arm.*-linux"
CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
-CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
-CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
-CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw "
+CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
+CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw"
+CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw"
+CMDLINE_OTHER = "dyntick=enable debug"
##############################################################
# Configure memory/ramdisk split for collie
@@ -34,7 +35,7 @@ CMDLINE_MEM_collie = "mem=${mem}M"
CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
CMDLINE_ROTATE_akita = "fbcon=rotate:1"
CMDLINE_ROTATE_borzoi = "fbcon=rotate:1"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} debug"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER}"
###############################################################
# Enable or disable ELPP via local.conf - default is "no"
@@ -45,6 +46,11 @@ ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
# module configs specific to this kernel
#
module_autoload_pxaficp_ir = "pxaficp_ir"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi"
+module_autoload_snd-soc-spitz_akita = "snd-soc-spitz"
+module_autoload_snd-soc-spitz_borzoi = "snd-soc-spitz"
+module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz"
do_configure() {
@@ -93,9 +99,10 @@ do_configure() {
do_compile_append() {
case ${MACHINE} in
c7x0 | akita | poodle | spitz | borzoi | tosa )
- size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
- if [ $size -ge 1271 ]; then
+ size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
+ if [ $size -ge 1302000 ]; 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
;;