From 8218bec1301bb41fb54ae30327b089c48f2e3b2c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Aug 2018 17:15:33 -0700 Subject: machines: Replace obsolete SERIAL_CONSOLE with SERIAL_CONSOLES Fix #302 Signed-off-by: Khem Raj --- 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 ddd3801..3bc7b2c 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_CONSOLE ?= "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 accdf3c..2f7dfae 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_CONSOLE ?= "115200 ttyS0" +SERIAL_CONSOLES ?= "115200 ttyS0" VC4_CMA_SIZE ?= "cma-128" diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf index 3bd9e95..9712f92 100644 --- a/conf/machine/raspberrypi0.conf +++ b/conf/machine/raspberrypi0.conf @@ -5,5 +5,5 @@ MACHINEOVERRIDES = "raspberrypi:${MACHINE}" include conf/machine/raspberrypi.conf -SERIAL_CONSOLE ?= "115200 ttyAMA0" +SERIAL_CONSOLES ?= "115200 ttyAMA0" VC4_CMA_SIZE ?= "cma-128" diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf index a17289c..9d4a4ff 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_CONSOLE ?= "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 fb21b12..1619dc3 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_CONSOLE ?= "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 8b5cce5..253230d 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_CONSOLE ?= "115200 ttyS0" +SERIAL_CONSOLES ?= "115200 ttyS0" VC4_CMA_SIZE ?= "cma-256" -- cgit v1.2.3-54-g00ecf