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 'u-boot-tegra/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
drivers
/
serial
/
serial.c
diff --git
a/drivers/serial/serial.c
b/drivers/serial/serial.c
index df05bde46106bdc7733571aa29bdb59781f1b6c8..fd61a5e54587890c53df39e157f8180d3ced6e35 100644
(file)
--- a/
drivers/serial/serial.c
+++ b/
drivers/serial/serial.c
@@
-74,9
+74,6
@@
static int on_baudrate(const char *name, const char *value, enum env_op op,
}
gd->baudrate = baudrate;
}
gd->baudrate = baudrate;
-#if defined(CONFIG_PPC) || defined(CONFIG_MCF52x2)
- gd->bd->bi_baudrate = baudrate;
-#endif
serial_setbrg();
serial_setbrg();
@@
-117,7
+114,7
@@
serial_initfunc(ns16550_serial_initialize);
serial_initfunc(pxa_serial_initialize);
serial_initfunc(s3c24xx_serial_initialize);
serial_initfunc(s5p_serial_initialize);
serial_initfunc(pxa_serial_initialize);
serial_initfunc(s3c24xx_serial_initialize);
serial_initfunc(s5p_serial_initialize);
-serial_initfunc(zynq_serial_initalize);
+serial_initfunc(zynq_serial_init
i
alize);
serial_initfunc(bfin_serial_initialize);
serial_initfunc(bfin_jtag_initialize);
serial_initfunc(mpc512x_serial_initialize);
serial_initfunc(bfin_serial_initialize);
serial_initfunc(bfin_jtag_initialize);
serial_initfunc(mpc512x_serial_initialize);
@@
-214,7
+211,7
@@
void serial_initialize(void)
bfin_serial_initialize();
bfin_jtag_initialize();
uartlite_serial_initialize();
bfin_serial_initialize();
bfin_jtag_initialize();
uartlite_serial_initialize();
- zynq_serial_initalize();
+ zynq_serial_init
i
alize();
au1x00_serial_initialize();
asc_serial_initialize();
jz_serial_initialize();
au1x00_serial_initialize();
asc_serial_initialize();
jz_serial_initialize();
@@
-502,12
+499,11
@@
int uart_post_test(int flags)
unsigned char c;
int ret, saved_baud, b;
struct serial_device *saved_dev, *s;
unsigned char c;
int ret, saved_baud, b;
struct serial_device *saved_dev, *s;
- bd_t *bd = gd->bd;
/* Save current serial state */
ret = 0;
saved_dev = serial_current;
/* Save current serial state */
ret = 0;
saved_dev = serial_current;
- saved_baud =
bd->bi_
baudrate;
+ saved_baud =
gd->
baudrate;
for (s = serial_devices; s; s = s->next) {
/* If this driver doesn't support loop back, skip it */
for (s = serial_devices; s; s = s->next) {
/* If this driver doesn't support loop back, skip it */
@@
-530,7
+526,7
@@
int uart_post_test(int flags)
/* Test every available baud rate */
for (b = 0; b < ARRAY_SIZE(bauds); ++b) {
/* Test every available baud rate */
for (b = 0; b < ARRAY_SIZE(bauds); ++b) {
-
bd->bi_
baudrate = bauds[b];
+
gd->
baudrate = bauds[b];
serial_setbrg();
/*
serial_setbrg();
/*
@@
-572,7
+568,7
@@
int uart_post_test(int flags)
done:
/* Restore previous serial state */
serial_current = saved_dev;
done:
/* Restore previous serial state */
serial_current = saved_dev;
-
bd->bi_
baudrate = saved_baud;
+
gd->
baudrate = saved_baud;
serial_reinit_all();
serial_setbrg();
serial_reinit_all();
serial_setbrg();