Merge

2004/09/20 15:01:22+09:30 (none)!rwhitby
Change the order of CMDLINE_ROOT and CMDLINE_CONSOLE to match the stock Linksys CMDLINE.

BKrev: 4152f6f1TH_1wqXUZJV7x_5lhiSAoA

diff --git a/linux/linux-nslu2_2.4.22.oe b/linux/linux-nslu2_2.4.22.oe
index 6d45ad1..f3fb496 100644 (file)
--- a/linux/linux-nslu2_2.4.22.oe
+++ b/linux/linux-nslu2_2.4.22.oe
@@ -21,9 +21,9 @@ inherit kernel
 
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
-CMDLINE_CONSOLE ?= "ttyS0,115200n8"
+CMDLINE_CONSOLE ?= "ttyS0,115200"
 CMDLINE_ROOT = "root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000"
-CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
 
 do_configure_prepend() {
        install -m 0644 ${WORKDIR}/defconfig ${S}/.config