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
Re-factoring the legacy NAND code (legacy NAND now only in board-specific
[platform/kernel/u-boot.git]
/
common
/
devices.c
diff --git
a/common/devices.c
b/common/devices.c
index
7b4a1cd
..
bd4dfa0
100644
(file)
--- a/
common/devices.c
+++ b/
common/devices.c
@@
-26,6
+26,7
@@
#include <stdarg.h>
#include <malloc.h>
#include <devices.h>
#include <stdarg.h>
#include <malloc.h>
#include <devices.h>
+#include <serial.h>
#ifdef CONFIG_LOGBUFFER
#include <logbuff.h>
#endif
#ifdef CONFIG_LOGBUFFER
#include <logbuff.h>
#endif
@@
-73,7
+74,7
@@
static void drv_system_init (void)
strcpy (dev.name, "serial");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
strcpy (dev.name, "serial");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-#if CONFIG_SERIAL_SOFTWARE_FIFO
+#if
def
CONFIG_SERIAL_SOFTWARE_FIFO
dev.putc = serial_buffered_putc;
dev.puts = serial_buffered_puts;
dev.getc = serial_buffered_getc;
dev.putc = serial_buffered_putc;
dev.puts = serial_buffered_puts;
dev.getc = serial_buffered_getc;
@@
-159,6
+160,8
@@
int device_deregister(char *devname)
int devices_init (void)
{
#ifndef CONFIG_ARM /* already relocated for current ARM implementation */
int devices_init (void)
{
#ifndef CONFIG_ARM /* already relocated for current ARM implementation */
+ DECLARE_GLOBAL_DATA_PTR;
+
ulong relocation_offset = gd->reloc_off;
int i;
ulong relocation_offset = gd->reloc_off;
int i;
@@
-192,6
+195,15
@@
int devices_init (void)
drv_logbuff_init ();
#endif
drv_system_init ();
drv_logbuff_init ();
#endif
drv_system_init ();
+#ifdef CONFIG_SERIAL_MULTI
+ serial_devices_init ();
+#endif
+#ifdef CONFIG_USB_TTY
+ drv_usbtty_init ();
+#endif
+#ifdef CONFIG_NETCONSOLE
+ drv_nc_init ();
+#endif
return (0);
}
return (0);
}