diff options
author | Darren Hart <dvhart@linux.intel.com> | 2012-03-14 12:32:42 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2012-03-20 11:19:27 -0700 |
commit | 9860bc55ffb8044bcf65fe0866cc76e6eef4e1ee (patch) | |
tree | 386aa787beda816e81b90aaed3fb6c03b42c56bf /meta-fri2/conf/machine/fri2-noemgd.conf | |
parent | 9124870a6bcd99ebaeb0342f4fedf14dc1afebd8 (diff) | |
download | meta-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>
Diffstat (limited to 'meta-fri2/conf/machine/fri2-noemgd.conf')
-rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index a0eb8a0f..9ba57538 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 | ||
18 | SYSLINUX_OPTS = "serial 0 115200" | 18 | # Syslinux does not know about the 64MHz uart clock and it does not detect the |
19 | SERIAL_CONSOLE = "115200 ttyS0" | 19 | # serial device by number. Use the IO port directly and divide the baud down to |
20 | APPEND += "console=ttyS0,115200 console=tty0" | 20 | # trick syslinux into configuring a 115200 baud. |
21 | SYSLINUX_OPTS = "serial 0xb060 3318" | ||
22 | SERIAL_CONSOLE = "115200 ttyPCH1" | ||
23 | APPEND += "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 |
23 | APPEND += "video=vesafb vga=0x318" | 26 | APPEND += "video=vesafb vga=0x318" |