From patchwork Thu Nov 22 19:13:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 201145 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 C40232C0089 for ; Fri, 23 Nov 2012 06:16:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3E5674A033; Thu, 22 Nov 2012 20:16:23 +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 0BYLnme3oLq9; Thu, 22 Nov 2012 20:16:23 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2534C4A09F; Thu, 22 Nov 2012 20:15:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 874404A030 for ; Thu, 22 Nov 2012 20:14:57 +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 k1IfbWqvNYhU for ; Thu, 22 Nov 2012 20:14:53 +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 0D3044A02E for ; Thu, 22 Nov 2012 20:14:47 +0100 (CET) Received: by mail-wg0-f74.google.com with SMTP id dt14so598707wgb.3 for ; Thu, 22 Nov 2012 11:14:47 -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:in-reply-to:references :x-gm-message-state; bh=GDw7s/joo7HYAvCRPF78HEa3XPzAV9f4rYGJcIAX6gQ=; b=FB5WYPSPkwkG9wgDNVToZ5dClFD+QGtUvB3apK7ITXBPbyhMoUPYjxACfDCSpjhd3R gmI+PZd2s6e0e1lbBKhQhx/SUD/0YYRh7/HvgmWCe+ob0G99cV1r3S8iAp3Yeu1NGwoV zBZGEHuNwiGeVWO7nTqzegMDYZEsWzad6osRGE14xBEht1MuctWjhf2F6Z9Ijq9JS/yL jcF7nPAkyLKJsbBY5YRdMyyu99ykhWiNi4lJ+gpZZPBlwiSZnrtJKG0JkwZ6WxvnnzGg Y5VVjFU153tCQw61LcVak/yvaMdNJhja4ubPJ5hDqMYLdHI0XGQCkfIlpG5dDSUsrivb ZV5A== Received: by 10.14.199.6 with SMTP id w6mr2212845een.0.1353611687417; Thu, 22 Nov 2012 11:14:47 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id u8si1008040een.1.2012.11.22.11.14.47 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 22 Nov 2012 11:14:47 -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 07317200063; Thu, 22 Nov 2012 11:14:47 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id BA00A160383; Thu, 22 Nov 2012 11:14:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 22 Nov 2012 11:13:02 -0800 Message-Id: <1353611587-18186-19-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1353611587-18186-1-git-send-email-sjg@chromium.org> References: <1353611587-18186-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQka1vO1uxZ/hVIbJJW5L3nwjLhslgutp6ku7t1eOlpeS55jpcRSaRx2LV9zogxkvDF2+XBQJs30uZ/uRqS7Mms0WpZriB4zv35RoXabW26cUg7XcVdVeqCKBzIAt/h47DfxoldK1qEnpddYnOeWO2he+j0Ur7wnAeCcNR9FbTcSFMVw4qQfzNHS5+hk0v5LwAJby+uL Cc: Tom Rini Subject: [U-Boot] [PATCH v2 18/23] console: Enable function to display console info 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 The CONFIG_SYS_CONSOLE_INFO_QUIET option should suppress the console information, but allow boards to display it later if required. Adjust the code to support this. This is used to avoid printing the information while the LCD display is not ready, since it only becomes ready when stdio init is complete. Signed-off-by: Simon Glass --- Changes in v2: None common/console.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/console.c b/common/console.c index 1177f7d..25b141a 100644 --- a/common/console.c +++ b/common/console.c @@ -591,7 +591,6 @@ int console_init_f(void) void stdio_print_current_devices(void) { -#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET /* Print information */ puts("In: "); if (stdio_devices[stdin] == NULL) { @@ -613,7 +612,6 @@ void stdio_print_current_devices(void) } else { printf ("%s\n", stdio_devices[stderr]->name); } -#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ } #ifdef CONFIG_SYS_CONSOLE_IS_IN_ENV @@ -685,7 +683,9 @@ done: gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ +#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET stdio_print_current_devices(); +#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE /* set the environment variables (will overwrite previous env settings) */ @@ -760,7 +760,9 @@ int console_init_r(void) gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ +#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET stdio_print_current_devices(); +#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ /* Setting environment variables */ for (i = 0; i < 3; i++) {