]> git.openpandora.org Git - openembedded.git/commitdiff
collie: fix collie serial console for 2.6 kernel
authorDirk Opfer <dirk@opfer-online.de>
Fri, 29 Dec 2006 21:12:14 +0000 (21:12 +0000)
committerDirk Opfer <dirk@opfer-online.de>
Fri, 29 Dec 2006 21:12:14 +0000 (21:12 +0000)
conf/machine/collie.conf
conf/machine/include/collie-2.4.conf
conf/machine/include/collie-2.6.conf
packages/linux/linux-rp.inc

index 170d90db7cb023aa809e935dbe17d1027014e1f6..e7e867e5396c8188dabfd4755fd1ba633d36442a 100644 (file)
@@ -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
 
index 8e79ebc634a1fb57ed7ccfeb78df229f47dfd20d..0412ea359a4401a1153f321b73b7d8f45fb04cf6 100644 (file)
@@ -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
index 76ff96d902ab089404d04f393b543fd22012c224..eab879368c1046276d7f5b75eeaceef0e3943363 100644 (file)
@@ -1,3 +1,4 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
+SERIAL_CONSOLE = "115200 ttySA0"
 MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"
index 95c5af6d1a17854c48ac5689f258fad52298d264..a9d7fcb07f446a1985f75b1837abbffb50e882df 100644 (file)
@@ -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"