projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
serial_scc.c
diff --git
a/cpu/mpc8260/serial_scc.c
b/cpu/mpc8260/serial_scc.c
index 3a6eaf0a6775647c5334181aa56645acf66883e3..4ab6a28640361dc7cda7a34859d0b79718987ae8 100644
(file)
--- a/
cpu/mpc8260/serial_scc.c
+++ b/
cpu/mpc8260/serial_scc.c
@@
-84,7
+84,7
@@
DECLARE_GLOBAL_DATA_PTR;
int serial_init (void)
{
int serial_init (void)
{
- volatile immap_t *im = (immap_t *)C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *)C
ONFIG_SYS
_IMMR;
volatile scc_t *sp;
volatile scc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
volatile scc_t *sp;
volatile scc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
@@
-201,7
+201,7
@@
serial_putc(const char c)
if (c == '\n')
serial_putc ('\r');
if (c == '\n')
serial_putc ('\r');
- im = (immap_t *)C
FG
_IMMR;
+ im = (immap_t *)C
ONFIG_SYS
_IMMR;
up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
tbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_tbase];
up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
tbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_tbase];
@@
-233,7
+233,7
@@
serial_getc(void)
volatile immap_t *im;
unsigned char c;
volatile immap_t *im;
unsigned char c;
- im = (immap_t *)C
FG
_IMMR;
+ im = (immap_t *)C
ONFIG_SYS
_IMMR;
up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];
up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];
@@
-257,7
+257,7
@@
serial_tstc()
volatile scc_uart_t *up;
volatile immap_t *im;
volatile scc_uart_t *up;
volatile immap_t *im;
- im = (immap_t *)C
FG
_IMMR;
+ im = (immap_t *)C
ONFIG_SYS
_IMMR;
up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];
up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];
@@
-321,7
+321,7
@@
serial_tstc()
void
kgdb_serial_init (void)
{
void
kgdb_serial_init (void)
{
- volatile immap_t *im = (immap_t *)C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *)C
ONFIG_SYS
_IMMR;
volatile scc_t *sp;
volatile scc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
volatile scc_t *sp;
volatile scc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
@@
-440,7
+440,7
@@
putDebugChar(const char c)
if (c == '\n')
putDebugChar ('\r');
if (c == '\n')
putDebugChar ('\r');
- im = (immap_t *)C
FG
_IMMR;
+ im = (immap_t *)C
ONFIG_SYS
_IMMR;
up = (scc_uart_t *)&im->im_dprambase[KGDB_PROFF_SCC];
tbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_tbase];
up = (scc_uart_t *)&im->im_dprambase[KGDB_PROFF_SCC];
tbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_tbase];
@@
-472,7
+472,7
@@
getDebugChar(void)
volatile immap_t *im;
unsigned char c;
volatile immap_t *im;
unsigned char c;
- im = (immap_t *)C
FG
_IMMR;
+ im = (immap_t *)C
ONFIG_SYS
_IMMR;
up = (scc_uart_t *)&im->im_dprambase[KGDB_PROFF_SCC];
rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];
up = (scc_uart_t *)&im->im_dprambase[KGDB_PROFF_SCC];
rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];