projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mx25 clocks: Fix MXC_FEC_CLK
[platform/kernel/u-boot.git]
/
common
/
stdio.c
diff --git
a/common/stdio.c
b/common/stdio.c
index
2501369
..
605ff3f
100644
(file)
--- a/
common/stdio.c
+++ b/
common/stdio.c
@@
-105,7
+105,7
@@
struct list_head* stdio_get_list(void)
return &(devs.list);
}
return &(devs.list);
}
-struct stdio_dev* stdio_get_by_name(c
har*
name)
+struct stdio_dev* stdio_get_by_name(c
onst char *
name)
{
struct list_head *pos;
struct stdio_dev *dev;
{
struct list_head *pos;
struct stdio_dev *dev;
@@
-155,12
+155,12
@@
int stdio_register (struct stdio_dev * dev)
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
#ifdef CONFIG_SYS_STDIO_DEREGISTER
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
#ifdef CONFIG_SYS_STDIO_DEREGISTER
-int stdio_deregister(char *devname)
+int stdio_deregister(c
onst c
har *devname)
{
int l;
struct list_head *pos;
struct stdio_dev *dev;
{
int l;
struct list_head *pos;
struct stdio_dev *dev;
- char temp_names[3][
8
];
+ char temp_names[3][
16
];
dev = stdio_get_by_name(devname);
dev = stdio_get_by_name(devname);
@@
-174,7
+174,7
@@
int stdio_deregister(char *devname)
}
memcpy (&temp_names[l][0],
stdio_devices[l]->name,
}
memcpy (&temp_names[l][0],
stdio_devices[l]->name,
- sizeof(
stdio_devices[l]->name
));
+ sizeof(
temp_names[l]
));
}
list_del(&(dev->list));
}
list_del(&(dev->list));
@@
-193,7
+193,7
@@
int stdio_deregister(char *devname)
int stdio_init (void)
{
int stdio_init (void)
{
-#if
!defined(CONFIG_RELOC_FIXUP_WORKS
)
+#if
defined(CONFIG_NEEDS_MANUAL_RELOC
)
/* already relocated for current ARM implementation */
ulong relocation_offset = gd->reloc_off;
int i;
/* already relocated for current ARM implementation */
ulong relocation_offset = gd->reloc_off;
int i;
@@
-203,7
+203,7
@@
int stdio_init (void)
stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
relocation_offset);
}
stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
relocation_offset);
}
-#endif /*
!CONFIG_RELOC_FIXUP_WORKS
*/
+#endif /*
CONFIG_NEEDS_MANUAL_RELOC
*/
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));
@@
-227,9
+227,7
@@
int stdio_init (void)
drv_logbuff_init ();
#endif
drv_system_init ();
drv_logbuff_init ();
#endif
drv_system_init ();
-#ifdef CONFIG_SERIAL_MULTI
serial_stdio_init ();
serial_stdio_init ();
-#endif
#ifdef CONFIG_USB_TTY
drv_usbtty_init ();
#endif
#ifdef CONFIG_USB_TTY
drv_usbtty_init ();
#endif