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 <[email protected]> CC: Tom Zanussi <[email protected]> --- meta-fri2/conf/machine/fri2-noemgd.conf | 9 ++++++--- meta-fri2/conf/machine/fri2.conf | 9 ++++++--- 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} \ ${XSERVER_IA32_VESA} \ " -SYSLINUX_OPTS = "serial 0 115200" -SERIAL_CONSOLE = "115200 ttyS0" -APPEND += "console=ttyS0,115200 console=tty0" +# Syslinux does not know about the 64MHz uart clock and it does not detect the +# serial device by number. Use the IO port directly and divide the baud down to +# trick syslinux into configuring a 115200 baud. +SYSLINUX_OPTS = "serial 0xb060 3318" +SERIAL_CONSOLE = "115200 ttyPCH1" +APPEND += "console=ttyPCH1,115200 console=tty0" # EFI boot will ignore this and use the EFI framebuffer at 800x600 APPEND += "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} \ PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_mesa-dri ?= "7.11" -SYSLINUX_OPTS = "serial 0 115200" -SERIAL_CONSOLE = "115200 ttyS0" -APPEND += "console=ttyS0,115200 console=tty0" +# Syslinux does not know about the 64MHz uart clock and it does not detect the +# serial device by number. Use the IO port directly and divide the baud down to +# trick syslinux into configuring a 115200 baud. +SYSLINUX_OPTS = "serial 0xb060 3318" +SERIAL_CONSOLE = "115200 ttyPCH1" +APPEND += "console=ttyPCH1,115200 console=tty0" # EFI boot will ignore this and use the EFI framebuffer at 800x600 APPEND += "video=vesafb vga=0x318" -- 1.7.5.4 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
