From patchwork Thu Nov 29 19:58:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 202819 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 039632C008F for ; Fri, 30 Nov 2012 06:59:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C4764A111; Thu, 29 Nov 2012 20:59:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BxXAmijWAFED; Thu, 29 Nov 2012 20:59:17 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C76AE4A12E; Thu, 29 Nov 2012 20:59:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AF1684A12E for ; Thu, 29 Nov 2012 20:59:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WKpazTgeDevt for ; Thu, 29 Nov 2012 20:59:12 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wg0-f74.google.com (mail-wg0-f74.google.com [74.125.82.74]) by theia.denx.de (Postfix) with ESMTPS id 04E9A4A111 for ; Thu, 29 Nov 2012 20:59:10 +0100 (CET) Received: by mail-wg0-f74.google.com with SMTP id dt14so1073587wgb.3 for ; Thu, 29 Nov 2012 11:59:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=RVpo0U5Z5msB9zxJDv0bi/80wPGABPKQKrMwGc7vKzQ=; b=Q0CUfScoJEYZST+AC0V7OgtzAO33NVHTUnAT1HSWV2IOo8hG2tY6gT7guwVLbSxIFT N/s70quPJVnkKGvasykhgbuWU9/gjuNK+E9q+sBZH2tKmz1541rG+AnIvvvylX0/f9Mz ZGN+7QjDYV8mPKwY0xZ8YV3yrsYw+9Yfe0aufa4NTRc/T2Jq5TZt6UjtmgoD7Sf8KLIf xVIVEXyCLuPos6p6ksoEXY2gPOTTt/Coj/aaAcbSsu9B8iEYZWSjqHYsNbA9RG3Jgw9/ 8T5ffMiwBkOP5CWenYg/rARrUDfXRwHGctvf8uiitR2x6JXR48E+xyUD7vbpwzDVS8RC sj/A== Received: by 10.14.180.2 with SMTP id i2mr6748575eem.1.1354219149976; Thu, 29 Nov 2012 11:59:09 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id z47si649081eel.0.2012.11.29.11.59.09 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 29 Nov 2012 11:59:09 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id 96DA120004E; Thu, 29 Nov 2012 11:59:09 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id DE75D16035C; Thu, 29 Nov 2012 11:59:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 29 Nov 2012 11:58:58 -0800 Message-Id: <1354219138-27698-5-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 X-Gm-Message-State: ALoCoQk/Zg/NXSJJ8zzCPfbFoJsU/DK7uPGntOS5iTSBYWiXCf6HoCUO2n5fObwyAwXl+FBzcFrjk7lGKyR5PeBMzDkIxRaW4X3wPVVSrpKSNTxnTsDrDes+kdhyu+clQpnvJvTeBveloQn4/XJTVRpAhalo9DGSadCss5dQ6H0ObeCE3COoFM7oT7/+oOD0EcN01lZ0mbnE Subject: [U-Boot] [PATCH v2 5/5] x86: Select stdio devices for coreboot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de We want to support VGA, serial, USB keyboard and the Coreboot memory console buffer. Signed-off-by: Simon Glass --- 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 --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 */