diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-15 17:15:33 -0700 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2018-08-16 11:34:33 +0100 |
commit | 8218bec1301bb41fb54ae30327b089c48f2e3b2c (patch) | |
tree | 77dc8a877547b49f5912c885359b9fbc5dce5479 | |
parent | b660366a30fddff5f9de876239ac0aee00955134 (diff) | |
download | meta-raspberrypi-8218bec1301bb41fb54ae30327b089c48f2e3b2c.tar.gz |
machines: Replace obsolete SERIAL_CONSOLE with SERIAL_CONSOLES
Fix #302
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | conf/machine/raspberrypi.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi0-wifi.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi0.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi2.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi3-64.conf | 2 | ||||
-rw-r--r-- | 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" | |||
7 | require conf/machine/include/tune-arm1176jzf-s.inc | 7 | require conf/machine/include/tune-arm1176jzf-s.inc |
8 | include conf/machine/include/rpi-base.inc | 8 | include conf/machine/include/rpi-base.inc |
9 | 9 | ||
10 | SERIAL_CONSOLE ?= "115200 ttyAMA0" | 10 | SERIAL_CONSOLES ?= "115200 ttyAMA0" |
11 | 11 | ||
12 | UBOOT_MACHINE = "rpi_config" | 12 | UBOOT_MACHINE = "rpi_config" |
13 | VC4_CMA_SIZE_raspberrypi ?= "cma-64" | 13 | 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 += "\ | |||
13 | 13 | ||
14 | SDIMG_KERNELIMAGE ?= "kernel.img" | 14 | SDIMG_KERNELIMAGE ?= "kernel.img" |
15 | UBOOT_MACHINE ?= "rpi_0_w_defconfig" | 15 | UBOOT_MACHINE ?= "rpi_0_w_defconfig" |
16 | SERIAL_CONSOLE ?= "115200 ttyS0" | 16 | SERIAL_CONSOLES ?= "115200 ttyS0" |
17 | VC4_CMA_SIZE ?= "cma-128" | 17 | 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 @@ | |||
5 | MACHINEOVERRIDES = "raspberrypi:${MACHINE}" | 5 | MACHINEOVERRIDES = "raspberrypi:${MACHINE}" |
6 | include conf/machine/raspberrypi.conf | 6 | include conf/machine/raspberrypi.conf |
7 | 7 | ||
8 | SERIAL_CONSOLE ?= "115200 ttyAMA0" | 8 | SERIAL_CONSOLES ?= "115200 ttyAMA0" |
9 | VC4_CMA_SIZE ?= "cma-128" | 9 | 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" | |||
7 | require conf/machine/include/tune-cortexa7.inc | 7 | require conf/machine/include/tune-cortexa7.inc |
8 | include conf/machine/include/rpi-base.inc | 8 | include conf/machine/include/rpi-base.inc |
9 | 9 | ||
10 | SERIAL_CONSOLE ?= "115200 ttyAMA0" | 10 | SERIAL_CONSOLES ?= "115200 ttyAMA0" |
11 | 11 | ||
12 | UBOOT_MACHINE = "rpi_2_config" | 12 | UBOOT_MACHINE = "rpi_2_config" |
13 | VC4_CMA_SIZE ?= "cma-256" | 13 | 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 = " \ | |||
20 | broadcom/bcm2837-rpi-3-b.dtb \ | 20 | broadcom/bcm2837-rpi-3-b.dtb \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SERIAL_CONSOLE ?= "115200 ttyS0" | 23 | SERIAL_CONSOLES ?= "115200 ttyS0" |
24 | VC4_CMA_SIZE ?= "cma-256" | 24 | VC4_CMA_SIZE ?= "cma-256" |
25 | 25 | ||
26 | UBOOT_MACHINE = "rpi_3_config" | 26 | 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 += "\ | |||
15 | 15 | ||
16 | SDIMG_KERNELIMAGE ?= "kernel7.img" | 16 | SDIMG_KERNELIMAGE ?= "kernel7.img" |
17 | UBOOT_MACHINE = "rpi_3_32b_config" | 17 | UBOOT_MACHINE = "rpi_3_32b_config" |
18 | SERIAL_CONSOLE ?= "115200 ttyS0" | 18 | SERIAL_CONSOLES ?= "115200 ttyS0" |
19 | VC4_CMA_SIZE ?= "cma-256" | 19 | VC4_CMA_SIZE ?= "cma-256" |