From patchwork Tue Jan 10 19:16:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 135293 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 7F1B3B6FC8 for ; Wed, 11 Jan 2012 06:24:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DCC6E285F2; Tue, 10 Jan 2012 20:24:51 +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 si9H6wT2um0D; Tue, 10 Jan 2012 20:24:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 791D0285FC; Tue, 10 Jan 2012 20:24:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4DE48285FC for ; Tue, 10 Jan 2012 20:24:47 +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 A5eQvO26ChPp for ; Tue, 10 Jan 2012 20:24:45 +0100 (CET) X-Greylist: delayed 408 seconds by postgrey-1.27 at theia; Tue, 10 Jan 2012 20:24:43 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-ee0-f74.google.com (mail-ee0-f74.google.com [74.125.83.74]) by theia.denx.de (Postfix) with ESMTPS id 5FE81285F2 for ; Tue, 10 Jan 2012 20:24:43 +0100 (CET) Received: by eekd41 with SMTP id d41so34120eek.3 for ; Tue, 10 Jan 2012 11:24:43 -0800 (PST) Received: by 10.14.10.216 with SMTP id 64mr331028eev.4.1326223078569; Tue, 10 Jan 2012 11:17:58 -0800 (PST) Received: by 10.14.10.216 with SMTP id 64mr331010eev.4.1326223078410; Tue, 10 Jan 2012 11:17:58 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id v41si52624976eea.2.2012.01.10.11.17.58 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 10 Jan 2012 11:17:58 -0800 (PST) Received: from peppermint.mtv.corp.google.com (peppermint.mtv.corp.google.com [172.22.73.61]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id F03582000EE; Tue, 10 Jan 2012 11:17:57 -0800 (PST) Received: by peppermint.mtv.corp.google.com (Postfix, from userid 121310) id 63D1E19AA30; Tue, 10 Jan 2012 11:17:57 -0800 (PST) From: Doug Anderson To: U-Boot Mailing List Date: Tue, 10 Jan 2012 11:16:58 -0800 Message-Id: <1326223018-12441-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1326223018-12441-1-git-send-email-dianders@chromium.org> References: <1326223018-12441-1-git-send-email-dianders@chromium.org> Cc: U-Boot Mailing List Subject: [U-Boot] [PATCH 2/2] bootm: Move silencing of linux console to deprecated config option. 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 If you would like the old behavior of having bootm modify the bootargs to silence the linux console when CONFIG_SILENT_CONSOLE is defined, you now need to define the config CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE. A previous change already added this new config to all known users of CONFIG_SILENT_CONSOLE. Signed-off-by: Doug Anderson --- README | 5 ++--- common/cmd_bootm.c | 10 +++++----- doc/README.silent | 13 ++++++++++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/README b/README index 7916777..9843dd1 100644 --- a/README +++ b/README @@ -606,9 +606,8 @@ The following options need to be configured: environment 'console=serial'. When CONFIG_SILENT_CONSOLE is defined, all console - messages (by U-Boot and Linux!) can be silenced with - the "silent" environment variable. See - doc/README.silent for more information. + messages can be silenced with the "silent" environment + variable. See doc/README.silent for more information. - Console Baudrate: CONFIG_BAUDRATE - in bps diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index d5745b1..8d1899e 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -83,8 +83,8 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */ static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #endif -#ifdef CONFIG_SILENT_CONSOLE -static void fixup_silent_linux(void); +#ifdef CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE +static void fixup_silent_linux(void) __attribute__ ((deprecated)); #endif static image_header_t *image_get_kernel(ulong img_addr, int verify); @@ -673,7 +673,7 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) show_boot_progress(8); -#ifdef CONFIG_SILENT_CONSOLE +#ifdef CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE if (images.os.os == IH_OS_LINUX) fixup_silent_linux(); #endif @@ -1228,7 +1228,7 @@ U_BOOT_CMD( /*******************************************************************/ /* helper routines */ /*******************************************************************/ -#ifdef CONFIG_SILENT_CONSOLE +#ifdef CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE static void fixup_silent_linux(void) { char buf[256], *start, *end; @@ -1259,7 +1259,7 @@ static void fixup_silent_linux(void) setenv("bootargs", buf); debug("after silent fix-up: %s\n", buf); } -#endif /* CONFIG_SILENT_CONSOLE */ +#endif /* CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE */ /*******************************************************************/ diff --git a/doc/README.silent b/doc/README.silent index a26e3df..8b4f892 100644 --- a/doc/README.silent +++ b/doc/README.silent @@ -15,6 +15,13 @@ The following actions are taken if "silent" is set at boot time: suppressed automatically. Make sure to enable "nulldev" by #defining CONFIG_SYS_DEVICE_NULLDEV in your board config file. - - When booting a linux kernel, the "bootargs" are fixed up so that - the argument "console=" will be in the command line, no matter how - it was set in "bootargs" before. + +The config option CONFIG_SILENT_CONSOLE previously also caused u-boot +to silence the Linux console (also based on the "silent" environment +variable) by modifying the "bootargs" so that the argument "console=" +would be in the command line no matter how it was set in "bootargs" +before. That behavior is now relegated to the config option +CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE with the warning that using +the option opens you up to a buffer overrun if your linux bootargs +can be >256 bytes. A non-deprecated solution is to use scripts to +dynamically construct your "console=" argument.