[meta-intel] [PATCH 1/1] conf/machine/intel-*: Add rootwait to APPEND variables

California Sullivan california.l.sullivan at intel.com
Mon Apr 25 20:00:31 PDT 2016


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 at intel.com>
---
 conf/machine/intel-core2-32.conf  | 2 +-
 conf/machine/intel-corei7-64.conf | 2 +-
 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 d2a4c30..5f8ee24 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -29,6 +29,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \
 
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyPCH0"
-APPEND += "console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
+APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
 
 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 8c7a21d..30d492f 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -28,6 +28,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \
 
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
-APPEND += "console=ttyS0,115200 console=tty0"
+APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
 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 9db17a5..68e1199 100644
--- a/conf/machine/intel-quark.conf
+++ b/conf/machine/intel-quark.conf
@@ -16,7 +16,7 @@ MACHINE_FEATURES += "intel-ucode"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware"
 
 SERIAL_CONSOLE = "115200 ttyS1"
-APPEND += "console=ttyS1,115200 console=tty0"
+APPEND += "rootwait console=ttyS1,115200 console=tty0"
 
 EFI_PROVIDER = "gummiboot"
 
-- 
2.5.5



More information about the meta-intel mailing list