diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-11-01 22:57:33 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-11-01 22:57:33 +0100 |
| commit | dbf331762374c2eae4b684fd4ed9308c249a8203 (patch) | |
| tree | e67f9333d835328718c38ea8d101bd517fe409b7 | |
| parent | 8410d39070087e36fcf21a579102ab54dbc002d5 (diff) | |
| parent | 7a9348728ebda63cdbaacffd83099aa71d9d4c54 (diff) | |
| download | u-boot-imx-dbf331762374c2eae4b684fd4ed9308c249a8203.zip u-boot-imx-dbf331762374c2eae4b684fd4ed9308c249a8203.tar.gz u-boot-imx-dbf331762374c2eae4b684fd4ed9308c249a8203.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
| -rwxr-xr-x | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_pl010.c (renamed from drivers/serial_pl010.c) | 0 | ||||
| -rw-r--r-- | drivers/serial/serial_pl011.c (renamed from drivers/serial_pl011.c) | 0 | ||||
| -rw-r--r-- | drivers/serial/serial_pl011.h (renamed from drivers/serial_pl011.h) | 0 |
5 files changed, 2 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 6bf05cc..1889698 100755 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -42,7 +42,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o atmel_usart.o \ s3c4510b_eth.o s3c4510b_uart.o \ sed13806.o sed156x.o \ serial.o serial_max3100.o \ - serial_pl010.o serial_pl011.o serial_xuartlite.o \ + serial_xuartlite.o \ sil680.o sl811_usb.o sm501.o smc91111.o smiLynxEM.o \ status_led.o sym53c8xx.o systemace.o ahci.o \ ti_pci1410a.o tigon3.o tsec.o \ diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 93c68dd..40f3d67 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libserial.a -COBJS := mcfuart.o +COBJS := mcfuart.o serial_pl010.o serial_pl011.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/drivers/serial_pl010.c b/drivers/serial/serial_pl010.c index 417b6ae..417b6ae 100644 --- a/drivers/serial_pl010.c +++ b/drivers/serial/serial_pl010.c diff --git a/drivers/serial_pl011.c b/drivers/serial/serial_pl011.c index 4d35fe5..4d35fe5 100644 --- a/drivers/serial_pl011.c +++ b/drivers/serial/serial_pl011.c diff --git a/drivers/serial_pl011.h b/drivers/serial/serial_pl011.h index 5f20fdd..5f20fdd 100644 --- a/drivers/serial_pl011.h +++ b/drivers/serial/serial_pl011.h |