diff mbox

[U-Boot,v2,5/5] x86: Select stdio devices for coreboot

Message ID 1354219138-27698-5-git-send-email-sjg@chromium.org
State Accepted, archived
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Nov. 29, 2012, 7:58 p.m. UTC 
We want to support VGA, serial, USB keyboard and the Coreboot memory
console buffer.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Collect settings in one place
- Use eserial0 instead of serial since this is now the correct name
- define CONFIG_EXTRA_ENV_SETTINGS so that these settings come through

 include/configs/coreboot.h |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
diff mbox

Patch

diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 5da006f..cfe5db3 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -92,6 +92,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 +252,7 @@ 
  */
 #define CONFIG_PCI
 
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	CONFIG_STD_DEVICES_SETTINGS
+
 #endif	/* __CONFIG_H */