diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2016-04-25 20:00:31 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2016-04-26 09:42:21 -0700 |
commit | d9727db3e7957d4842e4afeeeaa6420d5d2cfa7d (patch) | |
tree | 69ebbae0ea18c25b121954b5ecf54ee6dfeafb61 /conf | |
parent | d519b9d8e53e1e4dd3494d8a3a8e3e531b2b9788 (diff) | |
download | meta-intel-d9727db3e7957d4842e4afeeeaa6420d5d2cfa7d.tar.gz |
conf/machine/intel-*: Add rootwait to APPEND variables
When using the init-install-efi.sh scripts from oe-core to install to a
USB stick, we do not get the "rootwait" kernel command line option.
Without the rootwait option we get a kernel panic when
attempting to boot from the installed USB stick.
This patch adds rootwait to the kernel command line of all intel-*
MACHINEs as a temporary workaround. This could potentially impact boot
times with devices that do not require it, but in testing with a
Silverjaw lure and SSD on a MinnowBoard Max, it did not have a noticable
impact.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 | ||||
-rw-r--r-- | conf/machine/intel-quark.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index d2a4c30d..5f8ee24f 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
@@ -29,6 +29,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
29 | 29 | ||
30 | SYSLINUX_OPTS = "serial 0 115200" | 30 | SYSLINUX_OPTS = "serial 0 115200" |
31 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyPCH0" | 31 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyPCH0" |
32 | APPEND += "console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" | 32 | APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" |
33 | 33 | ||
34 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" | 34 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 8c7a21d5..30d492f8 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -28,6 +28,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
28 | 28 | ||
29 | SYSLINUX_OPTS = "serial 0 115200" | 29 | SYSLINUX_OPTS = "serial 0 115200" |
30 | SERIAL_CONSOLE = "115200 ttyS0" | 30 | SERIAL_CONSOLE = "115200 ttyS0" |
31 | APPEND += "console=ttyS0,115200 console=tty0" | 31 | APPEND += "rootwait console=ttyS0,115200 console=tty0" |
32 | 32 | ||
33 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" | 33 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" |
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf index 9db17a50..68e11993 100644 --- a/conf/machine/intel-quark.conf +++ b/conf/machine/intel-quark.conf | |||
@@ -16,7 +16,7 @@ MACHINE_FEATURES += "intel-ucode" | |||
16 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" | 16 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" |
17 | 17 | ||
18 | SERIAL_CONSOLE = "115200 ttyS1" | 18 | SERIAL_CONSOLE = "115200 ttyS1" |
19 | APPEND += "console=ttyS1,115200 console=tty0" | 19 | APPEND += "rootwait console=ttyS1,115200 console=tty0" |
20 | 20 | ||
21 | EFI_PROVIDER = "gummiboot" | 21 | EFI_PROVIDER = "gummiboot" |
22 | 22 | ||