From patchwork Sun Aug 5 17:31:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 175194 X-Patchwork-Delegate: sbabic@denx.de 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 6B0032C00A0 for ; Mon, 6 Aug 2012 03:31:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BC17128113; Sun, 5 Aug 2012 19:31:55 +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 WP-UTy9tqmjc; Sun, 5 Aug 2012 19:31:55 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 24C05280FE; Sun, 5 Aug 2012 19:31:49 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C1CF9280E9 for ; Sun, 5 Aug 2012 19:31:45 +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 3d-ZNxxG+POV for ; Sun, 5 Aug 2012 19:31:44 +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 mail-gg0-f172.google.com (mail-gg0-f172.google.com [209.85.161.172]) by theia.denx.de (Postfix) with ESMTPS id 94792280F4 for ; Sun, 5 Aug 2012 19:31:44 +0200 (CEST) Received: by ggnc4 with SMTP id c4so2006557ggn.3 for ; Sun, 05 Aug 2012 10:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=OIzL+K8XU6/Zy8QLZOmCsWAV1joI74B7SyuIztr+vYY=; b=FrjFL+ezJd3y6EB1oBvHwvYAybWUZEo4xOos0Rn/pDr1lcElAY1v/FZfFpBpuV1qRp ZeL4y6Kv7YwCzSOV5Me1RqcJgL0Fc9COwjSZhLn7ruNcvXX3N0PnQft5djmpvGrxHtZ3 X+hUtyIjoCSVAnVt+4xy3hCyq/rFYwvT2m4eVM3lp4bs1NRKLJ1o877oQrD1CLktTbb6 dsHisjiEZiCvBEmv5vJjJd8Xc6U1qEGaIruYUlxg8jt/OaTVkYrr3K65HaSE1HQaAyBN ACgygKY3Zx9GX8HLwkoCjQHwzz6Ck5jgw2RwXdoi4hQI5LgneHaRTWu9MrZ+qqyxVarE JBow== Received: by 10.236.108.202 with SMTP id q50mr7852628yhg.6.1344187903524; Sun, 05 Aug 2012 10:31:43 -0700 (PDT) Received: from localhost.localdomain ([189.5.6.233]) by mx.google.com with ESMTPS id v8sm27447545yhi.15.2012.08.05.10.31.41 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 10:31:43 -0700 (PDT) From: Fabio Estevam To: u-boot@lists.denx.de Date: Sun, 5 Aug 2012 14:31:34 -0300 Message-Id: <1344187894-30940-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1344187894-30940-1-git-send-email-festevam@gmail.com> References: <1344187894-30940-1-git-send-email-festevam@gmail.com> Cc: Fabio Estevam Subject: [U-Boot] [PATCH 2/2] vision2: do not overwrite the console 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 From: Fabio Estevam On this board, the console is always set to the serial line. Do not allow to overwrite it when video is enabled. Signed-off-by: Fabio Estevam --- board/ttcontrol/vision2/vision2.c | 11 +++++++++-- include/configs/vision2.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c index d68bef7..d287544 100644 --- a/board/ttcontrol/vision2/vision2.c +++ b/board/ttcontrol/vision2/vision2.c @@ -674,11 +674,18 @@ int board_late_init(void) udelay(2000); #endif - setenv("stdout", "serial"); - return 0; } +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) +{ + return 1; +} + int checkboard(void) { puts("Board: TTControl Vision II CPU V\n"); diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 0ed53d2..34fc1cb 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -215,6 +215,8 @@ #define CONFIG_VIDEO_IPUV3 #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_CMD_BMP