summaryrefslogtreecommitdiff
path: root/packages/linux/nas100d-kernel.inc
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2005-11-22 22:09:20 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-22 22:09:20 +0000
commit55b467902c672d54e8c3751521589c13bae78071 (patch)
tree61a7d78636fbda7930bbc8851b1294b2384063b9 /packages/linux/nas100d-kernel.inc
parentb9ffed91a607ceb3ab1761060e9cc1c176149b86 (diff)
parent007b0f12cdf14948583d8c80bca970c115d70a69 (diff)
merge of 2d9229c5d5599b6452b58e1bd6237f75be857428
and 57be2e37d8f61e00f3da6c2d5362490f4071a500
Diffstat (limited to 'packages/linux/nas100d-kernel.inc')
-rw-r--r--packages/linux/nas100d-kernel.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/linux/nas100d-kernel.inc b/packages/linux/nas100d-kernel.inc
index 72af498439..f8da5d3059 100644
--- a/packages/linux/nas100d-kernel.inc
+++ b/packages/linux/nas100d-kernel.inc
@@ -171,10 +171,8 @@ KERNEL_IMAGETYPE = "zImage"
# contains the things for a specific kernel.
# CMDLINE_KERNEL_OPTIONS ?= "reboot=s"
CMDLINE_KERNEL_OPTIONS ?=
-CMDLINE_ROOT ?= "root=/dev/mtdblock3 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc"
-# Add distro specific debug (or non-debug) options to this
-# CMDLINE_DEBUG ?= "noirqdebug"
-CMDLINE_DEBUG ?=
+CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc"
+CMDLINE_DEBUG =
CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}"
# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as