diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-09-14 11:23:35 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2011-12-07 16:17:22 -0800 |
commit | a7056567a606d7a595ad5da331bb096614f50925 (patch) | |
tree | 2df906cea071f8df43abf133feb46a0b3c3a3e68 /meta-fri2/conf | |
parent | 3d5574efe623923b24f78d77f1d4bd8ef8432698 (diff) | |
download | meta-intel-a7056567a606d7a595ad5da331bb096614f50925.tar.gz |
fri2: use ttyS0,115200 for serial console and syslinux
The FRI2 has an optional serial expansion board. Enable the use of this
as a console for both syslinux and the OS.
Note: while the settings all appear to be correct, the serial port is
not working on my test device in syslinux or the getty. The
kernel messages do make their way to the serial port after PCI
initialization.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-fri2/conf')
-rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 4 | ||||
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index 1871cad6..3ac60c28 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf | |||
@@ -14,4 +14,8 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
14 | ${XSERVER_IA32_VESA} \ | 14 | ${XSERVER_IA32_VESA} \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SYSLINUX_OPTS = "serial 0 115200" | ||
18 | SERIAL_CONSOLE = "115200 ttyS0" | ||
19 | APPEND += "console=ttyS0,115200 console=tty0" | ||
20 | |||
17 | APPEND += "video=vesafb vga=0x318" | 21 | APPEND += "video=vesafb vga=0x318" |
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 15036a4c..ae69742b 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
@@ -18,4 +18,8 @@ PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | |||
18 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 18 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
19 | PREFERRED_VERSION_emgd-driver-bin ?= "1.8" | 19 | PREFERRED_VERSION_emgd-driver-bin ?= "1.8" |
20 | 20 | ||
21 | SYSLINUX_OPTS = "serial 0 115200" | ||
22 | SERIAL_CONSOLE = "115200 ttyS0" | ||
23 | APPEND += "console=ttyS0,115200 console=tty0" | ||
24 | |||
21 | APPEND += "video=vesafb vga=0x318" | 25 | APPEND += "video=vesafb vga=0x318" |