projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Command usage cleanup
[oweals/u-boot.git]
/
cpu
/
nios2
/
serial.c
diff --git
a/cpu/nios2/serial.c
b/cpu/nios2/serial.c
index 3d766037a14f9e33447176e339529aa1f10abb55..8bbb803a6893c319cce8a7706affb1ee5dd66b8a 100644
(file)
--- a/
cpu/nios2/serial.c
+++ b/
cpu/nios2/serial.c
@@
-24,7
+24,7
@@
#include <common.h>
#include <watchdog.h>
#include <common.h>
#include <watchdog.h>
-#include <
nios2
.h>
+#include <
asm/io
.h>
#include <nios2-io.h>
DECLARE_GLOBAL_DATA_PTR;
#include <nios2-io.h>
DECLARE_GLOBAL_DATA_PTR;
@@
-34,8
+34,7
@@
DECLARE_GLOBAL_DATA_PTR;
*-----------------------------------------------------------------*/
#if defined(CONFIG_CONSOLE_JTAG)
*-----------------------------------------------------------------*/
#if defined(CONFIG_CONSOLE_JTAG)
-static nios_jtag_t *jtag =
- (nios_jtag_t *)CACHE_BYPASS(CFG_NIOS_CONSOLE);
+static nios_jtag_t *jtag = (nios_jtag_t *)CONFIG_SYS_NIOS_CONSOLE;
void serial_setbrg( void ){ return; }
int serial_init( void ) { return(0);}
void serial_setbrg( void ){ return; }
int serial_init( void ) { return(0);}
@@
-44,9
+43,9
@@
void serial_putc (char c)
{
unsigned val;
{
unsigned val;
- while (NIOS_JTAG_WSPACE (
jtag->control
) == 0)
+ while (NIOS_JTAG_WSPACE (
readl (&jtag->control)
) == 0)
WATCHDOG_RESET ();
WATCHDOG_RESET ();
-
jtag->data = (unsigned char)c
;
+
writel (&jtag->data, (unsigned char)c)
;
}
void serial_puts (const char *s)
}
void serial_puts (const char *s)
@@
-57,7
+56,7
@@
void serial_puts (const char *s)
int serial_tstc (void)
{
int serial_tstc (void)
{
- return (
jtag->control
& NIOS_JTAG_RRDY);
+ return (
readl (&jtag->control)
& NIOS_JTAG_RRDY);
}
int serial_getc (void)
}
int serial_getc (void)
@@
-67,7
+66,7
@@
int serial_getc (void)
while (1) {
WATCHDOG_RESET ();
while (1) {
WATCHDOG_RESET ();
- val =
jtag->data
;
+ val =
readl (&jtag->data)
;
if (val & NIOS_JTAG_RVALID)
break;
}
if (val & NIOS_JTAG_RVALID)
break;
}
@@
-80,10
+79,9
@@
int serial_getc (void)
*-----------------------------------------------------------------*/
#else
*-----------------------------------------------------------------*/
#else
-static nios_uart_t *uart = (nios_uart_t *)
- CACHE_BYPASS(CFG_NIOS_CONSOLE);
+static nios_uart_t *uart = (nios_uart_t *) CONFIG_SYS_NIOS_CONSOLE;
-#if defined(C
FG
_NIOS_FIXEDBAUD)
+#if defined(C
ONFIG_SYS
_NIOS_FIXEDBAUD)
/* Everything's already setup for fixed-baud PTF
* assignment
/* Everything's already setup for fixed-baud PTF
* assignment
@@
-98,7
+96,7
@@
void serial_setbrg (void)
unsigned div;
div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1;
unsigned div;
div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1;
-
uart->divisor = div
;
+
writel (&uart->divisor,div)
;
return;
}
return;
}
@@
-108,7
+106,7
@@
int serial_init (void)
return (0);
}
return (0);
}
-#endif /* C
FG
_NIOS_FIXEDBAUD */
+#endif /* C
ONFIG_SYS
_NIOS_FIXEDBAUD */
/*-----------------------------------------------------------------------
/*-----------------------------------------------------------------------
@@
-118,9
+116,9
@@
void serial_putc (char c)
{
if (c == '\n')
serial_putc ('\r');
{
if (c == '\n')
serial_putc ('\r');
- while ((
uart->status
& NIOS_UART_TRDY) == 0)
+ while ((
readl (&uart->status)
& NIOS_UART_TRDY) == 0)
WATCHDOG_RESET ();
WATCHDOG_RESET ();
-
uart->txdata = (unsigned char)c
;
+
writel (&uart->txdata,(unsigned char)c)
;
}
void serial_puts (const char *s)
}
void serial_puts (const char *s)
@@
-132,14
+130,14
@@
void serial_puts (const char *s)
int serial_tstc (void)
{
int serial_tstc (void)
{
- return (
uart->status
& NIOS_UART_RRDY);
+ return (
readl (&uart->status)
& NIOS_UART_RRDY);
}
int serial_getc (void)
{
while (serial_tstc () == 0)
WATCHDOG_RESET ();
}
int serial_getc (void)
{
while (serial_tstc () == 0)
WATCHDOG_RESET ();
- return
( uart->rxdata
& 0x00ff );
+ return
(readl (&uart->rxdata)
& 0x00ff );
}
#endif /* CONFIG_JTAG_CONSOLE */
}
#endif /* CONFIG_JTAG_CONSOLE */