diff options
| author | Wolfgang Denk <[email protected]> | 2007-11-02 15:09:22 +0100 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2007-11-02 15:09:22 +0100 |
| commit | e60adeac2d8fa30258e1706bb342a3363526e8d7 (patch) | |
| tree | 4be3ed35fbd50b56ac0cebecac2899d6527edbf0 /drivers | |
| parent | d78791ae914d4e7c5edca1cdad73b3dc81a4eb82 (diff) | |
| parent | f0516920f6e048425b005c049378e80d600bd268 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/work
Diffstat (limited to 'drivers')
| -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 | ||||
| -rw-r--r-- | drivers/tsec.c | 1 |
6 files changed, 3 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 00978d82853..d19588f3af4 100755 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -45,7 +45,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o at45.o ata_piix.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 tqm8xx_pcmcia.o tsec.o \ diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 93c68dd2e08..40f3d672ec9 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 417b6aeda64..417b6aeda64 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 4d35fe5e9ed..4d35fe5e9ed 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 5f20fdd108a..5f20fdd108a 100644 --- a/drivers/serial_pl011.h +++ b/drivers/serial/serial_pl011.h diff --git a/drivers/tsec.c b/drivers/tsec.c index 4ff3339c7de..7ba8f0cace9 100644 --- a/drivers/tsec.c +++ b/drivers/tsec.c @@ -803,6 +803,7 @@ static void startup_tsec(struct eth_device *dev) /* Tell the DMA it is clear to go */ regs->dmactrl |= DMACTRL_INIT_SETTINGS; regs->tstat = TSTAT_CLEAR_THALT; + regs->rstat = RSTAT_CLEAR_RHALT; regs->dmactrl &= ~(DMACTRL_GRS | DMACTRL_GTS); } |