summaryrefslogtreecommitdiff
path: root/arch/powerpc/boot/serial.c
diff options
context:
space:
mode:
authorGerhard Pircher <gerhard_pircher@gmx.net>2009-02-10 15:26:11 +0300
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-02-11 08:00:09 +0300
commit8f23735d8f8cfd4d46e3aa336690f52b8b5d3c75 (patch)
tree7e8644dc5661cfe80ee8685914589de1b1ab3faa /arch/powerpc/boot/serial.c
parent50408b7defa513a9ea1107b42674167e53ba7a4a (diff)
downloadlinux-8f23735d8f8cfd4d46e3aa336690f52b8b5d3c75.tar.xz
powerpc/amigaone: Bootwrapper and serial console support for AmigaOne
This adds the bootwrapper for the cuImage target and a compatible property check for "pnpPNP,501" to the generic serial console support code. The default link address for the cuImage target is set to 0x800000. This allows to boot the kernel with AmigaOS4's second level bootloader, which always loads a uImage at 0x500000. Signed-off-by: Gerhard Pircher <gerhard_pircher@gmx.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/serial.c')
-rw-r--r--arch/powerpc/boot/serial.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 8b3607cb53fb..f2156f07571f 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -117,7 +117,8 @@ int serial_console_init(void)
if (devp == NULL)
goto err_out;
- if (dt_is_compatible(devp, "ns16550"))
+ if (dt_is_compatible(devp, "ns16550") ||
+ dt_is_compatible(devp, "pnpPNP,501"))
rc = ns16550_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))
rc = mpsc_console_init(devp, &serial_cd);