summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-03-14 19:32:42 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2012-03-20 18:19:27 (GMT)
commit9860bc55ffb8044bcf65fe0866cc76e6eef4e1ee (patch)
tree386aa787beda816e81b90aaed3fb6c03b42c56bf
parent9124870a6bcd99ebaeb0342f4fedf14dc1afebd8 (diff)
downloadmeta-intel-9860bc55ffb8044bcf65fe0866cc76e6eef4e1ee.tar.gz
fri2: Update serial console settings
With the pch_uart changes now in tree, update the machine config to make use of it. Trick syslinux into using the port by IO address and a magic baud rate. Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf9
-rw-r--r--meta-fri2/conf/machine/fri2.conf9
2 files changed, 12 insertions, 6 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index a0eb8a0..9ba5753 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -15,9 +15,12 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
15 ${XSERVER_IA32_VESA} \ 15 ${XSERVER_IA32_VESA} \
16 " 16 "
17 17
18SYSLINUX_OPTS = "serial 0 115200" 18# Syslinux does not know about the 64MHz uart clock and it does not detect the
19SERIAL_CONSOLE = "115200 ttyS0" 19# serial device by number. Use the IO port directly and divide the baud down to
20APPEND += "console=ttyS0,115200 console=tty0" 20# trick syslinux into configuring a 115200 baud.
21SYSLINUX_OPTS = "serial 0xb060 3318"
22SERIAL_CONSOLE = "115200 ttyPCH1"
23APPEND += "console=ttyPCH1,115200 console=tty0"
21 24
22# EFI boot will ignore this and use the EFI framebuffer at 800x600 25# EFI boot will ignore this and use the EFI framebuffer at 800x600
23APPEND += "video=vesafb vga=0x318" 26APPEND += "video=vesafb vga=0x318"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 3947736..3801836 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -18,9 +18,12 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
18PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 18PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
19PREFERRED_VERSION_mesa-dri ?= "7.11" 19PREFERRED_VERSION_mesa-dri ?= "7.11"
20 20
21SYSLINUX_OPTS = "serial 0 115200" 21# Syslinux does not know about the 64MHz uart clock and it does not detect the
22SERIAL_CONSOLE = "115200 ttyS0" 22# serial device by number. Use the IO port directly and divide the baud down to
23APPEND += "console=ttyS0,115200 console=tty0" 23# trick syslinux into configuring a 115200 baud.
24SYSLINUX_OPTS = "serial 0xb060 3318"
25SERIAL_CONSOLE = "115200 ttyPCH1"
26APPEND += "console=ttyPCH1,115200 console=tty0"
24 27
25# EFI boot will ignore this and use the EFI framebuffer at 800x600 28# EFI boot will ignore this and use the EFI framebuffer at 800x600
26APPEND += "video=vesafb vga=0x318" 29APPEND += "video=vesafb vga=0x318"