collie: fix collie serial console for 2.6 kernel

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 170d90d..e7e867e 100644 (file)
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -20,8 +20,6 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 include conf/machine/include/tune-strongarm.conf
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 

diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf
index 8e79ebc..0412ea3 100644 (file)
--- a/conf/machine/include/collie-2.4.conf
+++ b/conf/machine/include/collie-2.4.conf
@@ -1,5 +1,6 @@
 PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix"
 
+SERIAL_CONSOLE = "115200 ttyS0"
 #
 # no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
 # no usbgadget feature because 2.4 kernel handle it in own way on each machine

diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf
index 76ff96d..eab8793 100644 (file)
--- a/conf/machine/include/collie-2.6.conf
+++ b/conf/machine/include/collie-2.6.conf
@@ -1,3 +1,4 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
+SERIAL_CONSOLE = "115200 ttySA0"
 MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"

diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index 95c5af6..a9d7fcb 100644 (file)
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -24,6 +24,7 @@ COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux8
 KERNEL_IMAGETYPE_qemux86 = "bzImage"
 
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
+CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd"
 CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
 CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"
 CMDLINE_OTHER = "dyntick=enable"