summaryrefslogtreecommitdiffstats
path: root/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-12-04 02:17:07 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-12-14 23:28:04 +0000
commit3a5fbf530231e55aab91bc86ca1733b5fa3b6951 (patch)
treec0c8341127dc264047c9dce3481192fe632c4270 /import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
parent7f28bc5ce604549f6a1ef536e8d7eafe0d779a79 (diff)
downloadtalos-openbmc-3a5fbf530231e55aab91bc86ca1733b5fa3b6951.tar.gz
talos-openbmc-3a5fbf530231e55aab91bc86ca1733b5fa3b6951.zip
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>
Diffstat (limited to 'import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf')
-rw-r--r--import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
index ad3b06126..ddd380161 100644
--- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
+++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
@@ -7,7 +7,7 @@ DEFAULTTUNE ?= "arm1176jzfshf"
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"
OpenPOWER on IntegriCloud