[oe-commits] org.oe.dev collie: fix collie serial console for 2.6 kernel

[dirk commit]

collie: fix collie serial console for 2.6 kernel

Author: dirk at openembedded.org
Branch: org.openembedded.dev
Revision: 562347f263f94adfc20ea37413a2b6b2a54028fb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=562347f263f94adfc20ea37413a2b6b2a54028fb
Files:
1
conf/machine/collie.conf
conf/machine/include/collie-2.4.conf
conf/machine/include/collie-2.6.conf
packages/linux/linux-rp.inc
Diffs:

#
# mt diff -r893de226bac5c13d28f5f7adc8e8d5441e0839c7 -r562347f263f94adfc20ea37413a2b6b2a54028fb
#
# 
# 
# patch "conf/machine/collie.conf"
#  from [515a699feadd19aa57f7e26c0bad5b558b087e9d]
#    to [e9d2cc5d1403db67b0d6f420a23e7bdbbeed0632]
# 
# patch "conf/machine/include/collie-2.4.conf"
#  from [946986a35226dc890efe5812f258ca7224219154]
#    to [0c8cedfb520ed3c04ee1c7d2686e471e125358d7]
# 
# patch "conf/machine/include/collie-2.6.conf"
#  from [7bb098a03cc76867b7ae4c7c0747a8e973de3182]
#    to [ff89817282693d6fc788edab75ba21e1f8ec411d]
# 
# patch "packages/linux/linux-rp.inc"
#  from [d2fb92118d4162a90ac50069809f98310d0889bc]
#    to [02dc082f4854a606c803550f8545eb1980f5d379]
# 
============================================================
--- conf/machine/collie.conf	515a699feadd19aa57f7e26c0bad5b558b087e9d
+++ conf/machine/collie.conf	e9d2cc5d1403db67b0d6f420a23e7bdbbeed0632
@@ -20,8 +20,6 @@ include conf/machine/include/tune-strong
 
 include conf/machine/include/tune-strongarm.conf
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
============================================================
--- conf/machine/include/collie-2.4.conf	946986a35226dc890efe5812f258ca7224219154
+++ conf/machine/include/collie-2.4.conf	0c8cedfb520ed3c04ee1c7d2686e471e125358d7
@@ -1,5 +1,6 @@ PREFERRED_PROVIDER_virtual/kernel = "col
 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
============================================================
--- conf/machine/include/collie-2.6.conf	7bb098a03cc76867b7ae4c7c0747a8e973de3182
+++ conf/machine/include/collie-2.6.conf	ff89817282693d6fc788edab75ba21e1f8ec411d
@@ -1,3 +1,4 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
+SERIAL_CONSOLE = "115200 ttySA0"
 MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"
============================================================
--- packages/linux/linux-rp.inc	d2fb92118d4162a90ac50069809f98310d0889bc
+++ packages/linux/linux-rp.inc	02dc082f4854a606c803550f8545eb1980f5d379
@@ -24,6 +24,7 @@ CMDLINE_CON = "console=ttyS0,115200n8 co
 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"