summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-09-14 11:23:35 -0700
committerDarren Hart <dvhart@linux.intel.com>2011-12-08 13:55:04 -0800
commit5bad886cb29df89c1736f2b8ce6e76be7f529d4f (patch)
tree5d788a9e98b8c5ef1f6847fde3a80ea29dc210a3
parentc3e12aa981e97261093abee05bb0301c35f54c23 (diff)
downloadmeta-intel-5bad886cb29df89c1736f2b8ce6e76be7f529d4f.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>
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index b02e0374..867cf7f1 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -26,7 +26,9 @@ XSERVER ?= "xserver-xf86-dri-lite \
26 xf86-input-synaptics \ 26 xf86-input-synaptics \
27 xf86-video-vesa" 27 xf86-video-vesa"
28 28
29SYSLINUX_OPTS = "serial 0 115200"
29SERIAL_CONSOLE = "115200 ttyS0" 30SERIAL_CONSOLE = "115200 ttyS0"
31APPEND += "console=ttyS0,115200 console=tty0"
30 32
31MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" 33MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
32 34
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index eab4b505..49d72249 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -29,7 +29,9 @@ XSERVER ?= "xserver-xf86-dri-lite \
29PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3" 29PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
30PREFERRED_VERSION_emgd-driver-bin ?= "1.8" 30PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
31 31
32SYSLINUX_OPTS = "serial 0 115200"
32SERIAL_CONSOLE = "115200 ttyS0" 33SERIAL_CONSOLE = "115200 ttyS0"
34APPEND += "console=ttyS0,115200 console=tty0"
33 35
34MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" 36MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
35 37