commit 37a0e4ddff58c0120cc5cfef104b60d0e180638c
author Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Dec 04 01:01:44 2017 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Dec 14 17:17:23 2017 +0000
tree 1628857a2eb33ab517ba93d6a3ca25e55bd3e628
parent 3c4c45d1e9a2324191a8640b22df1b71f15f3037

Squashed 'import-layers/yocto-poky/' changes from dc8508f6099..67491b0c104

Yocto 2.2.2 (Morty)

Change-Id: Id9a452e28940d9f166957de243d9cb1d8818704e
git-subtree-dir: import-layers/yocto-poky
git-subtree-split: 67491b0c104101bb9f366d697edd23c895be4302
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

import-layers/yocto-poky/meta/conf/machine/qemumips64.conf

diff --git a/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf b/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf
index 9529f4c..3f91cbe 100644
--- a/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf
+++ b/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf
@@ -9,6 +9,6 @@
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"