commit 3a5fbf530231e55aab91bc86ca1733b5fa3b6951
author Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Dec 04 02:17:07 2017 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Dec 14 23:28:04 2017 +0000
tree c0c8341127dc264047c9dce3481192fe632c4270
parent 7f28bc5ce604549f6a1ef536e8d7eafe0d779a79

Squashed 'import-layers/meta-raspberrypi/' changes from cce6292e414..2a192261a91

Yocto 2.2.2 (Morty)

Change-Id: I96e39defae033e9f458f7c38a3b67296d6b3060f
git-subtree-dir: import-layers/meta-raspberrypi
git-subtree-split: 2a192261a914892019f4f428d7462bb3c585ebac
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf

diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
index ad3b061..ddd3801 100644
--- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
+++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/tune-arm1176jzf-s.inc
 include conf/machine/include/rpi-base.inc
 
-SERIAL_CONSOLE = "115200 ttyAMA0"
+SERIAL_CONSOLE ?= "115200 ttyAMA0"
 
 UBOOT_MACHINE = "rpi_config"
 VC4_CMA_SIZE_raspberrypi ?= "cma-64"