[oe-commits] Andrea Adami : linux-kexecboot.inc: to be quiet we set master console on serial. Bump PR.

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 65fa06e7eca9c1e19bb4f36aa9c72de4ee62a4d2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=65fa06e7eca9c1e19bb4f36aa9c72de4ee62a4d2

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Sat Oct 10 00:29:12 2009 +0200

linux-kexecboot.inc: to be quiet we set master console on serial. Bump PR.

---

 recipes/kexecboot/linux-kexecboot.inc |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc
index 5193212..bf54173 100644
--- a/recipes/kexecboot/linux-kexecboot.inc
+++ b/recipes/kexecboot/linux-kexecboot.inc
@@ -1,5 +1,5 @@
 # We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels:
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "file://defconfig"
 
@@ -11,12 +11,13 @@ require ../linux/linux.inc
 DONT_CHECK_KERNELSIZE = ""
 INITRAMFS_IMAGE = "initramfs-kexecboot-image"
 
-CMDLINE = "console=ttyS0,115200n8 console=tty1"
-CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
-CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
-CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1"
-CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
-CMDLINE_hx4700 = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
+# here we set master console on serial
+CMDLINE = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
+CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
 
 PACKAGES = ""
 PROVIDES = ""