summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 92052927..da35bb0a 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -23,7 +23,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
23# trick syslinux into configuring a 115200 baud. 23# trick syslinux into configuring a 115200 baud.
24SYSLINUX_OPTS = "serial 0xb060 3318" 24SYSLINUX_OPTS = "serial 0xb060 3318"
25SERIAL_CONSOLE = "115200 ttyPCH1" 25SERIAL_CONSOLE = "115200 ttyPCH1"
26APPEND += "console=ttyPCH1,115200 console=tty0" 26APPEND += "console=ttyPCH1,115200 console=tty0 nopat"
27 27
28# 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
29APPEND += "video=vesafb vga=0x318" 29APPEND += "video=vesafb vga=0x318"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index f90deb31..e20f1cce 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -29,7 +29,7 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
29# trick syslinux into configuring a 115200 baud. 29# trick syslinux into configuring a 115200 baud.
30SYSLINUX_OPTS = "serial 0xb060 3318" 30SYSLINUX_OPTS = "serial 0xb060 3318"
31SERIAL_CONSOLE = "115200 ttyPCH1" 31SERIAL_CONSOLE = "115200 ttyPCH1"
32APPEND += "console=ttyPCH1,115200 console=tty0" 32APPEND += "console=ttyPCH1,115200 console=tty0 nopat"
33 33
34# EFI boot will ignore this and use the EFI framebuffer at 800x600 34# EFI boot will ignore this and use the EFI framebuffer at 800x600
35APPEND += "video=vesafb vga=0x318" 35APPEND += "video=vesafb vga=0x318"