diff options
| author | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
| commit | 7c6237b3e2f2ee0098897da39b79aff4642b8946 (patch) | |
| tree | d768b7851bb688f543da0a3ed50c927a2bde2804 /cpu/arm1136/mx31/serial.c | |
| parent | dd1c5523d6f44e842e69f2fcb50788c6060eab86 (diff) | |
| parent | c956717ab25c962ef49d49064dfc73f4edcba1fb (diff) | |
| download | u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.zip u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.gz u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'cpu/arm1136/mx31/serial.c')
| -rw-r--r-- | cpu/arm1136/mx31/serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/arm1136/mx31/serial.c b/cpu/arm1136/mx31/serial.c index 1cad8f9..f498599 100644 --- a/cpu/arm1136/mx31/serial.c +++ b/cpu/arm1136/mx31/serial.c @@ -63,6 +63,7 @@ #define URXD_FRMERR (1<<12) #define URXD_BRK (1<<11) #define URXD_PRERR (1<<10) +#define URXD_RX_DATA (0xFF) #define UCR1_ADEN (1<<15) /* Auto dectect interrupt */ #define UCR1_ADBR (1<<14) /* Auto detect baud rate */ #define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */ @@ -165,7 +166,7 @@ void serial_setbrg (void) int serial_getc (void) { while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY); - return __REG(UART_PHYS + URXD); + return (__REG(UART_PHYS + URXD) & URXD_RX_DATA); /* mask out status from upper word */ } void serial_putc (const char c) |