diff options
| author | George Nita <george.nita@enea.com> | 2015-09-03 05:12:11 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2015-09-03 05:12:11 +0200 |
| commit | 3ab7b40622ac62f2e8876adabfbfbcb80e62bb2e (patch) | |
| tree | 4428c3f371f1398555c203d1cb32088b41aceda4 /conf/machine/intel-core2-32.conf | |
| parent | a83cdb055a432ca3554b4ce7aab4ccd2243a5730 (diff) | |
| parent | cea00968b858b60222d68103491f076067d73876 (diff) | |
| download | meta-intel-3ab7b40622ac62f2e8876adabfbfbcb80e62bb2e.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'conf/machine/intel-core2-32.conf')
| -rw-r--r-- | conf/machine/intel-core2-32.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 09303e31..d9478fc0 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
| @@ -29,5 +29,5 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | SYSLINUX_OPTS = "serial 0 115200" | 31 | SYSLINUX_OPTS = "serial 0 115200" |
| 32 | SERIAL_CONSOLE = "115200 ttyS0" | 32 | SERIAL_CONSOLE = "115200 ttyS0 115200 ttyPCH0" |
| 33 | APPEND += "console=ttyS0,115200 console=tty0" | 33 | APPEND += "console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" |