aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-06-15 12:59:49 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-06-15 12:59:49 +0000
commitb9a5139dc514788d68326e06b80bb01961aab578 (patch)
tree21b21ff46d11a76404fdb7e397388aa54d497a10
parent41e9131509c8ff5e54d3cec041d7c10f3db46840 (diff)
downloadupstream-b9a5139dc514788d68326e06b80bb01961aab578.tar.gz
upstream-b9a5139dc514788d68326e06b80bb01961aab578.tar.bz2
upstream-b9a5139dc514788d68326e06b80bb01961aab578.zip
[x86] use ttyS0 @ 115200 baud as default for KVM guests
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32384 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/x86/image/Config.in6
1 files changed, 3 insertions, 3 deletions
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