summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-07-19 15:03:47 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-19 15:03:47 +0000
commitb992eedcc577867859d8ae2757a2a06f1b7b6460 (patch)
tree38e68e27c7c5c0453f7a3483eb076e5c46a3e03f /packages/linux
parenta6f5f86d2c6f1ed05ab471bbc719f5365efa1e7a (diff)
parentaa33ec8c089b6e0ed964f3f345e73c6fe9f4ba38 (diff)
propagate from branch 'org.openembedded.dev' (head a84100b19e514d33f6c1ebe63173f106d9b09026)
to branch 'org.openembedded.nslu2-linux' (head 37a0ff9ee9b45b44e556016ce81b5cba475a2b3f)
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/nslu2-kernel.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 44f466ef49..f5d7135c88 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -211,10 +211,12 @@ inherit kernel
ARCH = "arm"
KERNEL_IMAGETYPE = "zImage"
-# To specify the console set KERNEL_CONSOLE in the .bb
-# file. The default is currently set in machine/nslu2.conf
+# To specify the console set KERNEL_CONSOLE in the .bb file.
+# CMDLINE_ROOT contains the boot options
CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s"
-CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+# Add distro specific debug (or non-debug) options to this
+CMDLINE_DEBUG ?= ""
+CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}"
# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as
# required. Notice that this has to be done for each separately built