summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-06-19 17:34:52 +0000
committerJohn Bowler <jbowler@nslu2-linux.org>2005-06-19 17:34:52 +0000
commitd928b8f09a9fcc88cd464db086c2a0b1e5703f7d (patch)
tree29edea0b28cb2c2ca214935ecce7937b56e25fee /packages/linux
parent1b7f4986f7d0f1ff3938cd8f71809863d10e3efe (diff)
Clarify how the CONSOLE options work.
Add reboot=s BKrev: 42b5acbcCZowYKUWzO17VTbxpXaJ_Q
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/nslu2-kernel.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 8f3b620b25..f5b035a6e5 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -206,9 +206,9 @@ inherit kernel
ARCH = "arm"
KERNEL_IMAGETYPE = "zImage"
-CMDLINE_CONSOLE ?= "ttyS0,115200n8"
-CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc"
-#CMDLINE_ROOT ?= "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
+# To specify the console set KERNEL_CONSOLE in the .bb
+# file. The default is currently set in machine/nslu2.conf
+CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s"
CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as