From patchwork Fri Sep 14 08:29:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Ruppert X-Patchwork-Id: 183833 X-Patchwork-Delegate: trini@ti.com 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 F32B62C0084 for ; Fri, 14 Sep 2012 18:29:20 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ADAB0281CC; Fri, 14 Sep 2012 10:29:19 +0200 (CEST) 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 S8cj9VpQLioa; Fri, 14 Sep 2012 10:29:19 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5069D281AA; Fri, 14 Sep 2012 10:29:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 38BAC28181 for ; Fri, 14 Sep 2012 10:29:06 +0200 (CEST) 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 gRMnVWYc-kr1 for ; Fri, 14 Sep 2012 10:29:06 +0200 (CEST) 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 sew-notes-gt.sewerin.de (unknown [77.75.200.26]) by theia.denx.de (Postfix) with ESMTP id C02112819B for ; Fri, 14 Sep 2012 10:29:05 +0200 (CEST) Received: from localhost.localdomain ([10.1.1.128]) by sew-notes-gt.sewerin.de (Lotus Domino Release 8.5.3) with ESMTP id 2012091410285793-3422 ; Fri, 14 Sep 2012 10:28:57 +0200 From: Bastian Ruppert To: u-boot@lists.denx.de Date: Fri, 14 Sep 2012 10:29:00 +0200 Message-Id: <1347611344-7483-2-git-send-email-Bastian.Ruppert@Sewerin.de> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <20120902005045.46f464fc@wker> References: <20120902005045.46f464fc@wker> X-MIMETrack: Itemize by SMTP Server on SEW-KOM-GT-01/SEWERIN/DE(Release 8.5.3|September 15, 2011) at 14.09.2012 10:28:57, Serialize by Router on SEW-KOM-GT-01/SEWERIN/DE(Release 8.5.3|September 15, 2011) at 14.09.2012 10:29:05, Serialize complete at 14.09.2012 10:29:05 Cc: Tom Rini , Bastian Ruppert Subject: [U-Boot] [PATCH v4 2/6] davinci: ea20: the console is always set to the serial line 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 Do not allow to overwrite it when video is enabled. Signed-off-by: Bastian Ruppert CC: Tom Rini Acked-by: Stefano Babic --- board/davinci/ea20/ea20.c | 11 +++++++++-- include/configs/ea20.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c index 69307e4..0edd910 100644 --- a/board/davinci/ea20/ea20.c +++ b/board/davinci/ea20/ea20.c @@ -254,6 +254,15 @@ int board_early_init_f(void) return 0; } +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) +{ + return 1; +} + int board_init(void) { /* arch number of the board */ @@ -281,8 +290,6 @@ int board_late_init(void) /* Set HALTEN to high */ gpio_direction_output(134, 1); - setenv("stdout", "serial"); - /* Set fixed contrast settings for LCD via I2C potentiometer */ buf[0] = 0x00; buf[1] = 0xd7; diff --git a/include/configs/ea20.h b/include/configs/ea20.h index a9caa81..f9a1462 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -125,6 +125,8 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_CMD_BMP +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #endif /*