diff options
author | Rod Whitby <rod@whitby.id.au> | 2005-11-12 08:00:15 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-12 08:00:15 +0000 |
commit | 1ede4e38cb897f8325758df06d4ca55a6e56d6bd (patch) | |
tree | ce5d6a67c765c8403603729672dd5f04f1030e79 /packages/linux/nas100d-kernel.inc | |
parent | 7aad88d6c1e741b0917ebd74128cebc1277ce989 (diff) | |
parent | 281243b4f1edc7bf5eafa1ccc375b72ac617b944 (diff) |
merge of 14567c9c4abe3eb73c714bca33a8ecdcf37a5f93
and 2fa748703e56caa7448653fa64a00952d5796474
Diffstat (limited to 'packages/linux/nas100d-kernel.inc')
-rw-r--r-- | packages/linux/nas100d-kernel.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/linux/nas100d-kernel.inc b/packages/linux/nas100d-kernel.inc index c9301816af..72af498439 100644 --- a/packages/linux/nas100d-kernel.inc +++ b/packages/linux/nas100d-kernel.inc @@ -169,10 +169,12 @@ KERNEL_IMAGETYPE = "zImage" # To specify the console set KERNEL_CONSOLE in the .bb file. # CMDLINE_ROOT contains the boot options, CMDLINE_KERNEL_OPTIONS # 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 ?= "noirqdebug" +CMDLINE_DEBUG ?= CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as |