diff options
| author | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 |
| commit | ce12a8c1a94a2b3d585feff387497f724b98e3ce (patch) | |
| tree | 6e5db764e27df2465f5e4d9487c7561d14050064 /common/stdio.c | |
| parent | b04eb342af72d5dbcc29ccd7f3f9475044113361 (diff) | |
| parent | 339c5111065c2b1893af1e4d6e9431b9496879a4 (diff) | |
| download | u-boot-imx-ce12a8c1a94a2b3d585feff387497f724b98e3ce.zip u-boot-imx-ce12a8c1a94a2b3d585feff387497f724b98e3ce.tar.gz u-boot-imx-ce12a8c1a94a2b3d585feff387497f724b98e3ce.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'common/stdio.c')
| -rw-r--r-- | common/stdio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/stdio.c b/common/stdio.c index 605ff3f..9f48e5f 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -237,6 +237,8 @@ int stdio_init (void) #ifdef CONFIG_JTAG_CONSOLE drv_jtag_console_init (); #endif - +#ifdef CONFIG_CBMEM_CONSOLE + cbmemc_init(); +#endif return (0); } |