From e8228bb05bf4f5087c535aa9cb4ac01e57fdb75c Mon Sep 17 00:00:00 2001 From: Stephen Neuendorffer Date: Wed, 9 Jan 2008 06:35:08 +1100 Subject: [PATCH] --- yaml --- r: 81231 b: refs/heads/master c: c35a8fb2f2467c93fe402b1d4b1e124341d0da13 h: refs/heads/master i: 81229: 170c8c7fa90b454051a31045c3acf68dab35d55b 81227: 3d7d1e3c61ea6c419f6a790332e9dd4f1fa8e612 81223: 29a9d76907fa0b39175628027ddc07e0aa921446 81215: c731f7c0391d62739f8b11ac7a69db1b0d2e15dd v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/serial.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6e130552d52e..02bcc686c48c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab99eee8ac902a0e176231447f318a0ed68f45d8 +refs/heads/master: c35a8fb2f2467c93fe402b1d4b1e124341d0da13 diff --git a/trunk/arch/powerpc/boot/serial.c b/trunk/arch/powerpc/boot/serial.c index cafeece20ac7..b6c68ef46809 100644 --- a/trunk/arch/powerpc/boot/serial.c +++ b/trunk/arch/powerpc/boot/serial.c @@ -128,7 +128,8 @@ int serial_console_init(void) rc = cpm_console_init(devp, &serial_cd); else if (dt_is_compatible(devp, "mpc5200-psc-uart")) rc = mpc5200_psc_console_init(devp, &serial_cd); - else if (dt_is_compatible(devp, "xilinx,uartlite")) + else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") || + dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a")) rc = uartlite_console_init(devp, &serial_cd); /* Add other serial console driver calls here */