summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Willmann <daniel@totalueberwachung.de>2008-01-20 11:24:02 +0000
committerDaniel Willmann <daniel@totalueberwachung.de>2008-01-20 11:24:02 +0000
commitdc1a55ec8e4847982449dc2683cd7d28524fefd5 (patch)
tree53e152645d4f1c7b0dc2fe7aace2b44f0b542472
parent6efd9617c2a48bb6dd79ec5fb2c405f769a700d9 (diff)
conf/machine/chumby.conf: Use rt73-k2wrlz instead of rt73-chumby since the
latter produces a kernel panic at the first sign of network traffic. packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb: Disable broken framebuffer modechanging code in the kernel. Make booting from USB default, add console=tty0 so we get to see the boot messages.
-rw-r--r--conf/machine/chumby.conf2
-rw-r--r--packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb9
2 files changed, 6 insertions, 5 deletions
diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf
index 84fc525b32..a1d6d43600 100644
--- a/conf/machine/chumby.conf
+++ b/conf/machine/chumby.conf
@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
MACHINE_EXTRA_RRECOMMENDS = "\
kernel-modules \
- rt73-chumby \
+ rt73-k2wrlz \
"
require conf/machine/include/tune-arm926ejs.inc
diff --git a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
index 37fe9f1a4e..b6cdf48144 100644
--- a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
+++ b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
@@ -3,11 +3,12 @@ require linux.inc
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Chumby"
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz \
http://files.chumby.com/source/ironforge/build396/align.pl \
file://chumby-override-cmdline.patch;patch=1 \
+ file://disable-fbchanging.patch;patch=1 \
file://defconfig \
"
@@ -18,10 +19,10 @@ COMPATIBLE_HOST = 'arm.*-linux'
ARCH = "arm"
# Use this CMDLINE for booting from RootFS 1 on the internal flash (22MB)
-CMDLINE = "console=ttyS0,38400 root=/dev/mtdblock5 rootfstype=jffs2 psplash=false"
+#CMDLINE = "console=ttyS0,38400 console=tty0 root=/dev/mtdblock5 rootfstype=jffs2 psplash=false"
-# Use this CMDLINE for booting from the first partition of an USB disk
-#CMDLINE = "console=ttyS0,38400 root=/dev/sda1 rootfstype=ext2 rootdelay=8 psplash=false"
+# Use this CMDLINE for booting from the second partition of an USB disk
+CMDLINE = "console=ttyS0,38400 console=tty0 root=/dev/sda2 rootfstype=ext2 rootdelay=8 psplash=false"
COMPATIBLE_MACHINE = "chumby"