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>

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 \
            xf86-input-synaptics \
            xf86-video-vesa"
 
+SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
 
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 \
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
+SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"