summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-28 10:21:33 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-28 10:21:33 +0200
commitcdfe818edc260adc555fe71c4995ef12662aa6b9 (patch)
treeadf27a123e0a707cc1598dd55f9fddc0461e03dd /target
parent9295124693d2f038e09243e475129a6f4d347042 (diff)
enable serial console on Rpi
Diffstat (limited to 'target')
-rw-r--r--target/arm/kernel/raspberry-pi2
-rw-r--r--target/config/Config.in.runtime1
-rw-r--r--target/config/Config.in.target3
3 files changed, 5 insertions, 1 deletions
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
index 135c473e3..0d75541e0 100644
--- a/target/arm/kernel/raspberry-pi
+++ b/target/arm/kernel/raspberry-pi
@@ -9,4 +9,6 @@ CONFIG_BCM2708_VCMEM=y
CONFIG_BCM2708_DMAER=y
CONFIG_VFP=y
CONFIG_BCM2708_VCHIQ=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_CMDLINE_EXTEND=y
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 2caec15ec..207bcc0c1 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -133,6 +133,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_AARCH64
default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI
default "ttyS0"
config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index ad1e8dfe0..e312200f8 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -48,7 +48,8 @@ config ADK_TARGET_CMDLINE
default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA
default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL
default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default "console=tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default "console=ttyAMA0 console=tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_VGA
+ default "console=tty1 console=ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_SERIAL
default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP