Skip to contentSkip to conversation

serial console definition split

PATCH In review Trevor Woerner 2 participants 2 messages Apr 13, 2016 – Apr 21, 2016 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore

Trevor Woerner

author
#0 lore raw

PATCH 1/1 serial console definition split

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 <[email protected]>
---
 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(-)
conf/machine/include/rpi-base.inc +0 -2
index 34eb774..f64bc9d 100644
@@ -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 \
conf/machine/raspberrypi.conf +2 -0
index e8516e7..0f95f1a 100644
@@ -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"
conf/machine/raspberrypi0.conf +2 -0
index 58468ed..ccf9ae7 100644
@@ -4,3 +4,5 @@
 
 MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
+
+SERIAL_CONSOLE = "115200 ttyAMA0"
conf/machine/raspberrypi2.conf +2 -0
index 30edae3..b6346e6 100644
@@ -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"
conf/machine/raspberrypi3.conf +2 -0
index 1b73f2f..cb6056e 100644
@@ -7,3 +7,5 @@ MACHINEOVERRIDES = "raspberrypi2:${MACHINE}"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-brcm43430"
 
 include conf/machine/raspberrypi2.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
Signature · 1 line
2.7.0.rc3
#1 lore raw

Hi Trevor,

Quoted 5 lines · Trevor Woerner

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 <[email protected]>

Merged this to master.

--
Andrei Gherzan