diff options
| author | Tom Rini <trini@ti.com> | 2014-09-13 16:32:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-13 16:32:52 -0400 |
| commit | 8d028d404fa117a4b1f425d7cfc8affe1d8df6d5 (patch) | |
| tree | 39cad1c0da41fd8e45a29a4dba23289cbd411773 /common/stdio.c | |
| parent | 114cc4290b2f24bb314edf2edd5d8738a0778c4b (diff) | |
| parent | 858530a8c0a7ce7e573e513934804a00d6676813 (diff) | |
| download | u-boot-imx-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.zip u-boot-imx-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.tar.gz u-boot-imx-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/stdio.c')
| -rw-r--r-- | common/stdio.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/common/stdio.c b/common/stdio.c index 692ca7f..c878103 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -215,7 +215,7 @@ int stdio_deregister(const char *devname) } #endif /* CONFIG_SYS_STDIO_DEREGISTER */ -int stdio_init (void) +int stdio_init_tables(void) { #if defined(CONFIG_NEEDS_MANUAL_RELOC) /* already relocated for current ARM implementation */ @@ -232,6 +232,11 @@ int stdio_init (void) /* Initialize the list */ INIT_LIST_HEAD(&(devs.list)); + return 0; +} + +int stdio_add_devices(void) +{ #ifdef CONFIG_SYS_I2C i2c_init_all(); #else @@ -265,5 +270,14 @@ int stdio_init (void) #ifdef CONFIG_CBMEM_CONSOLE cbmemc_init(); #endif - return (0); + + return 0; +} + +int stdio_init(void) +{ + stdio_init_tables(); + stdio_add_devices(); + + return 0; } |