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 /include | |
| 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 'include')
| -rw-r--r-- | include/configs/coreboot.h | 13 | ||||
| -rw-r--r-- | include/stdio_dev.h | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index 5da006f..a010adc 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -38,6 +38,7 @@ #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_LAST_STAGE_INIT #define CONFIG_X86_NO_RESET_VECTOR +#define CONFIG_SYS_VSNPRINTF /*----------------------------------------------------------------------- * Watchdog Configuration @@ -92,6 +93,15 @@ #define CONFIG_SYS_NS16550_COM2 UART1_BASE #define CONFIG_SYS_NS16550_PORT_MAPPED +#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,eserial0\0" \ + "stdout=vga,eserial0,cbmem\0" \ + "stderr=vga,eserial0,cbmem\0" + +#define CONFIG_CONSOLE_MUX +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_STDIO_DEREGISTER +#define CONFIG_CBMEM_CONSOLE + /* max. 1 IDE bus */ #define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 drive per IDE bus */ @@ -243,4 +253,7 @@ */ #define CONFIG_PCI +#define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_STD_DEVICES_SETTINGS + #endif /* __CONFIG_H */ diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 23e0ee1..932d093 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -120,5 +120,8 @@ int drv_nc_init (void); #ifdef CONFIG_JTAG_CONSOLE int drv_jtag_console_init (void); #endif +#ifdef CONFIG_CBMEM_CONSOLE +int cbmemc_init(void); +#endif #endif |