From 576ac2786948e15b9e47d49ccd187acbf380f128 Mon Sep 17 00:00:00 2001
From: Hugo Hromic <hhromic@gmail.com>
Date: Thu, 16 Aug 2018 14:20:34 +0100
Subject: [PATCH] machines: use new format for SERIAL_CONSOLES

From the documentation:

    SERIAL_CONSOLES - Provide a value that specifies the baud rate followed by
    the TTY device name separated by a semicolon. Use spaces to separate
    multiple devices

Fixes build error of `systemd-serialgetty` after recent commit 8218bec.

See: <https://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-SERIAL_CONSOLES>

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
---
 conf/machine/raspberrypi.conf       | 2 +-
 conf/machine/raspberrypi0-wifi.conf | 2 +-
 conf/machine/raspberrypi0.conf      | 2 +-
 conf/machine/raspberrypi2.conf      | 2 +-
 conf/machine/raspberrypi3-64.conf   | 2 +-
 conf/machine/raspberrypi3.conf      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index 3bc7b2c..9a9133c 100644
--- a/conf/machine/raspberrypi.conf
+++ b/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_CONSOLES ?= "115200 ttyAMA0"
+SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
 UBOOT_MACHINE = "rpi_config"
 VC4_CMA_SIZE_raspberrypi ?= "cma-64"
diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf
index 2f7dfae..594538f 100644
--- a/conf/machine/raspberrypi0-wifi.conf
+++ b/conf/machine/raspberrypi0-wifi.conf
@@ -13,5 +13,5 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 
 SDIMG_KERNELIMAGE ?= "kernel.img"
 UBOOT_MACHINE ?= "rpi_0_w_defconfig"
-SERIAL_CONSOLES ?= "115200 ttyS0"
+SERIAL_CONSOLES ?= "115200;ttyS0"
 VC4_CMA_SIZE ?= "cma-128"
diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf
index 9712f92..b75fc58 100644
--- a/conf/machine/raspberrypi0.conf
+++ b/conf/machine/raspberrypi0.conf
@@ -5,5 +5,5 @@
 MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
 
-SERIAL_CONSOLES ?= "115200 ttyAMA0"
+SERIAL_CONSOLES ?= "115200;ttyAMA0"
 VC4_CMA_SIZE ?= "cma-128"
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index 9d4a4ff..a353702 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -7,7 +7,7 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 
-SERIAL_CONSOLES ?= "115200 ttyAMA0"
+SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
 UBOOT_MACHINE = "rpi_2_config"
 VC4_CMA_SIZE ?= "cma-256"
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
index 1619dc3..c03f775 100644
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -20,7 +20,7 @@ RPI_KERNEL_DEVICETREE = " \
     broadcom/bcm2837-rpi-3-b.dtb \
     "
 
-SERIAL_CONSOLES ?= "115200 ttyS0"
+SERIAL_CONSOLES ?= "115200;ttyS0"
 VC4_CMA_SIZE ?= "cma-256"
 
 UBOOT_MACHINE = "rpi_3_config"
diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf
index 253230d..e5df51a 100644
--- a/conf/machine/raspberrypi3.conf
+++ b/conf/machine/raspberrypi3.conf
@@ -15,5 +15,5 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 
 SDIMG_KERNELIMAGE ?= "kernel7.img"
 UBOOT_MACHINE = "rpi_3_32b_config"
-SERIAL_CONSOLES ?= "115200 ttyS0"
+SERIAL_CONSOLES ?= "115200;ttyS0"
 VC4_CMA_SIZE ?= "cma-256"