From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 8 Sep 2008 10:56:08 +0200 Subject: [U-Boot] [PATCH] [UPDATE #2] Merged serial_pl010.c and serial_pl011.c. In-Reply-To: <1220861851-25043-1-git-send-email-andreas.engel@ericsson.com> References: <20080906203459.4E44324815@gemini.denx.de> <1220861851-25043-1-git-send-email-andreas.engel@ericsson.com> Message-ID: <20080908085608.GA3956@game.jcrosoft.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 10:17 Mon 08 Sep , Andreas Engel wrote: > They only differ in the init function. > This also adds the missing watchdog support for the PL011. > > Signed-off-by: Andreas Engel > --- > > Updated patch to the current git head as of today. > > drivers/serial/Makefile | 3 +- > drivers/serial/serial_pl011.c | 161 --------------------- > drivers/serial/{serial_pl010.c => serial_pl01x.c} | 83 +++++++++-- > drivers/serial/{serial_pl011.h => serial_pl01x.h} | 0 > 4 files changed, 69 insertions(+), 178 deletions(-) > delete mode 100644 drivers/serial/serial_pl011.c > rename drivers/serial/{serial_pl010.c => serial_pl01x.c} (66%) > rename drivers/serial/{serial_pl011.h => serial_pl01x.h} (100%) > > diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile > index f30014d..3cc1999 100644 > --- a/drivers/serial/Makefile > +++ b/drivers/serial/Makefile > @@ -33,8 +33,7 @@ COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o > COBJS-$(CONFIG_S3C64XX) += s3c64xx.o > COBJS-y += serial.o > COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o > -COBJS-y += serial_pl010.o > -COBJS-y += serial_pl011.o > +COBJS-y += serial_pl01x.o > COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o > COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o > COBJS-$(CONFIG_USB_TTY) += usbtty.o > diff --git a/drivers/serial/serial_pl011.c b/drivers/serial/serial_pl011.c > deleted file mode 100644 > index 4d35fe5..0000000 > --- a/drivers/serial/serial_pl011.c > +++ /dev/null > @@ -1,161 +0,0 @@ > -/* > - * (C) Copyright 2000 > - * Rob Taylor, Flying Pig Systems. robt at flyingpig.com. > - * > - * (C) Copyright 2004 > - * ARM Ltd. > - * Philippe Robin, > - * > - * See file CREDITS for list of people who contributed to this > - * project. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > +++ b/drivers/serial/serial_pl01x.c > @@ -31,24 +31,28 @@ > #include > #include > > -#ifdef CFG_PL010_SERIAL > +#if defined(CFG_PL010_SERIAL) || defined(CFG_PL011_SERIAL) Please move this to the Makefile Best Regards, J.