summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Hromic <hhromic@gmail.com>2018-08-16 14:20:34 +0100
committerAndrei Gherzan <andrei@gherzan.com>2018-08-16 17:54:54 +0100
commit576ac2786948e15b9e47d49ccd187acbf380f128 (patch)
treefa63701f12cdd3ac88e09f2553ad809ce2f6f839
parent8218bec1301bb41fb54ae30327b089c48f2e3b2c (diff)
downloadmeta-raspberrypi-576ac2786948e15b9e47d49ccd187acbf380f128.tar.gz
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>
-rw-r--r--conf/machine/raspberrypi.conf2
-rw-r--r--conf/machine/raspberrypi0-wifi.conf2
-rw-r--r--conf/machine/raspberrypi0.conf2
-rw-r--r--conf/machine/raspberrypi2.conf2
-rw-r--r--conf/machine/raspberrypi3-64.conf2
-rw-r--r--conf/machine/raspberrypi3.conf2
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"
7require conf/machine/include/tune-arm1176jzf-s.inc 7require conf/machine/include/tune-arm1176jzf-s.inc
8include conf/machine/include/rpi-base.inc 8include conf/machine/include/rpi-base.inc
9 9
10SERIAL_CONSOLES ?= "115200 ttyAMA0" 10SERIAL_CONSOLES ?= "115200;ttyAMA0"
11 11
12UBOOT_MACHINE = "rpi_config" 12UBOOT_MACHINE = "rpi_config"
13VC4_CMA_SIZE_raspberrypi ?= "cma-64" 13VC4_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 += "\
13 13
14SDIMG_KERNELIMAGE ?= "kernel.img" 14SDIMG_KERNELIMAGE ?= "kernel.img"
15UBOOT_MACHINE ?= "rpi_0_w_defconfig" 15UBOOT_MACHINE ?= "rpi_0_w_defconfig"
16SERIAL_CONSOLES ?= "115200 ttyS0" 16SERIAL_CONSOLES ?= "115200;ttyS0"
17VC4_CMA_SIZE ?= "cma-128" 17VC4_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 @@
5MACHINEOVERRIDES = "raspberrypi:${MACHINE}" 5MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
6include conf/machine/raspberrypi.conf 6include conf/machine/raspberrypi.conf
7 7
8SERIAL_CONSOLES ?= "115200 ttyAMA0" 8SERIAL_CONSOLES ?= "115200;ttyAMA0"
9VC4_CMA_SIZE ?= "cma-128" 9VC4_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"
7require conf/machine/include/tune-cortexa7.inc 7require conf/machine/include/tune-cortexa7.inc
8include conf/machine/include/rpi-base.inc 8include conf/machine/include/rpi-base.inc
9 9
10SERIAL_CONSOLES ?= "115200 ttyAMA0" 10SERIAL_CONSOLES ?= "115200;ttyAMA0"
11 11
12UBOOT_MACHINE = "rpi_2_config" 12UBOOT_MACHINE = "rpi_2_config"
13VC4_CMA_SIZE ?= "cma-256" 13VC4_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 = " \
20 broadcom/bcm2837-rpi-3-b.dtb \ 20 broadcom/bcm2837-rpi-3-b.dtb \
21 " 21 "
22 22
23SERIAL_CONSOLES ?= "115200 ttyS0" 23SERIAL_CONSOLES ?= "115200;ttyS0"
24VC4_CMA_SIZE ?= "cma-256" 24VC4_CMA_SIZE ?= "cma-256"
25 25
26UBOOT_MACHINE = "rpi_3_config" 26UBOOT_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 += "\
15 15
16SDIMG_KERNELIMAGE ?= "kernel7.img" 16SDIMG_KERNELIMAGE ?= "kernel7.img"
17UBOOT_MACHINE = "rpi_3_32b_config" 17UBOOT_MACHINE = "rpi_3_32b_config"
18SERIAL_CONSOLES ?= "115200 ttyS0" 18SERIAL_CONSOLES ?= "115200;ttyS0"
19VC4_CMA_SIZE ?= "cma-256" 19VC4_CMA_SIZE ?= "cma-256"