From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 15 Jun 2012 12:59:49 +0000 (+0000)
Subject: use ttyS0 @ 115200 baud as default for KVM guests
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e3663ff907cf6083e02010716b0a580d21a88168;p=openwrt%2Fstaging%2Fnbd.git

use ttyS0 @ 115200 baud as default for KVM guests

SVN-Revision: 32384
---

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 87213aea07..9a1317bb6c 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -29,15 +29,15 @@ config X86_GRUB_CONSOLE
 config X86_GRUB_SERIAL
 	string "Serial port device"
 	depends X86_GRUB_IMAGES
-	default "hvc0" if (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
-	default "ttyS0" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+	default "hvc0" if TARGET_x86_xen_domu
+	default "ttyS0" if ! TARGET_x86_xen_domu
 
 config X86_GRUB_BAUDRATE
 	int "Serial port baud rate"
 	depends X86_GRUB_IMAGES
 	default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
 	default 38400 if TARGET_x86_alix2
-	default 115200 if TARGET_x86_geos
+	default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
 	default 38400
 
 config X86_GRUB_BOOTOPTS