diff options
Diffstat (limited to 'meta-fri2/conf')
-rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 9 | ||||
-rw-r--r-- | 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 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" |
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 39477367..38018364 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
@@ -18,9 +18,12 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
18 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 18 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
19 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 19 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
20 | 20 | ||
21 | SYSLINUX_OPTS = "serial 0 115200" | 21 | # Syslinux does not know about the 64MHz uart clock and it does not detect the |
22 | SERIAL_CONSOLE = "115200 ttyS0" | 22 | # serial device by number. Use the IO port directly and divide the baud down to |
23 | APPEND += "console=ttyS0,115200 console=tty0" | 23 | # trick syslinux into configuring a 115200 baud. |
24 | SYSLINUX_OPTS = "serial 0xb060 3318" | ||
25 | SERIAL_CONSOLE = "115200 ttyPCH1" | ||
26 | APPEND += "console=ttyPCH1,115200 console=tty0" | ||
24 | 27 | ||
25 | # EFI boot will ignore this and use the EFI framebuffer at 800x600 | 28 | # EFI boot will ignore this and use the EFI framebuffer at 800x600 |
26 | APPEND += "video=vesafb vga=0x318" | 29 | APPEND += "video=vesafb vga=0x318" |