[yocto] [meta-raspberrypi][PATCH 1/5] SERIAL_CONSOLE definition split

[Theodor Gherzan]

From: Trevor Woerner <twoerner at gmail.com>

The latest raspberrypi3 puts its console on ttyS0 instead of ttyAMA0 (like all
the preceding boards). Therefore pull this definition out of the common
include file and add it separately for each MACHINE.

Signed-off-by: Trevor Woerner <twoerner at gmail.com>
Signed-off-by: Theodor Gherzan <theodor at resin.io>
---
 conf/machine/include/rpi-base.inc | 2 --
 conf/machine/raspberrypi.conf     | 2 ++
 conf/machine/raspberrypi0.conf    | 2 ++
 conf/machine/raspberrypi2.conf    | 2 ++
 conf/machine/raspberrypi3.conf    | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index 792150e..b125506 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -7,8 +7,6 @@ include conf/machine/include/soc-family.inc
 
 IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg"
 
-SERIAL_CONSOLE = "115200 ttyAMA0"
-
 XSERVER = " \
     xserver-xorg \
     xf86-input-evdev \
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index e8516e7..0f95f1a 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -6,3 +6,5 @@ DEFAULTTUNE ?= "arm1176jzfshf"
 
 require conf/machine/include/tune-arm1176jzf-s.inc
 include conf/machine/include/rpi-base.inc
+
+SERIAL_CONSOLE = "115200 ttyAMA0"
diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf
index 58468ed..ccf9ae7 100644
--- a/conf/machine/raspberrypi0.conf
+++ b/conf/machine/raspberrypi0.conf
@@ -4,3 +4,5 @@
 
 MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
+
+SERIAL_CONSOLE = "115200 ttyAMA0"
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index 30edae3..b6346e6 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -6,3 +6,5 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 
 require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
+
+SERIAL_CONSOLE = "115200 ttyAMA0"
diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf
index 1b73f2f..cb6056e 100644
--- a/conf/machine/raspberrypi3.conf
+++ b/conf/machine/raspberrypi3.conf
@@ -7,3 +7,5 @@ MACHINEOVERRIDES = "raspberrypi2:${MACHINE}"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-brcm43430"
 
 include conf/machine/raspberrypi2.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
-- 
2.1.4