From patchwork Fri Aug 17 20:49:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Hershberger X-Patchwork-Id: 178371 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 6DF952C00C5 for ; Sat, 18 Aug 2012 06:50:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 904E428808; Fri, 17 Aug 2012 22:50:05 +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 1zJPAQtgUaJd; Fri, 17 Aug 2012 22:50:05 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 56DA62880E; Fri, 17 Aug 2012 22:50:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 07C5828810 for ; Fri, 17 Aug 2012 22:50:00 +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 NGvMmebhRpVp for ; Fri, 17 Aug 2012 22:49:59 +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 spamkiller06.natinst.com (mailserver6.natinst.com [130.164.80.6]) by theia.denx.de (Postfix) with ESMTP id E72B5287E5 for ; Fri, 17 Aug 2012 22:49:58 +0200 (CEST) Received: from mailserv58-us.natinst.com (nb-hsrp-1338.natinst.com [130.164.19.133]) by spamkiller06.natinst.com (8.14.4/8.14.4) with ESMTP id q7HKnuOe024590; Fri, 17 Aug 2012 15:49:56 -0500 Received: from linux-xvxi.natinst.com ([130.164.14.197]) by mailserv58-us.natinst.com (Lotus Domino Release 8.5.2FP3) with ESMTP id 2012081715495628-1270336 ; Fri, 17 Aug 2012 15:49:56 -0500 From: Joe Hershberger To: u-boot@lists.denx.de Date: Fri, 17 Aug 2012 15:49:41 -0500 Message-Id: <1345236586-19076-8-git-send-email-joe.hershberger@ni.com> X-Mailer: git-send-email 1.7.11.5 In-Reply-To: <1345236586-19076-1-git-send-email-joe.hershberger@ni.com> References: <20100622222932.DCDB71524EE@gemini.denx.de> <1345236586-19076-1-git-send-email-joe.hershberger@ni.com> X-MIMETrack: Itemize by SMTP Server on MailServ58-US/AUS/H/NIC(Release 8.5.2FP3|July 10, 2011) at 08/17/2012 03:49:56 PM, Serialize by Router on MailServ58-US/AUS/H/NIC(Release 8.5.2FP3|July 10, 2011) at 08/17/2012 03:49:56 PM, Serialize complete at 08/17/2012 03:49:56 PM X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.7.7855, 1.0.260, 0.0.0000 definitions=2012-08-17_03:2012-08-17, 2012-08-17, 1970-01-01 signatures=0 Cc: Joe Hershberger Subject: [U-Boot] [PATCH 07/12] env: Update serial baudrate in env_relocate() 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 After the env is relocated, make sure that the serial baudrate is applied in case it's different (such as the env_nand case). Signed-off-by: Joe Hershberger --- common/env_common.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/common/env_common.c b/common/env_common.c index 0c7e845..e58971d 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -232,6 +232,10 @@ int env_import(const char *buf, int check) void env_relocate(void) { +#ifdef CONFIG_BAUDRATE_UPDATE_ON_RELOC + const char *baudrate_str; +#endif + #if defined(CONFIG_NEEDS_MANUAL_RELOC) env_reloc(); #endif @@ -253,6 +257,21 @@ void env_relocate(void) else gd->flags &= ~GD_FLG_SILENT; #endif + +#ifdef CONFIG_BAUDRATE_UPDATE_ON_RELOC + baudrate_str = getenv("baudrate"); + if (baudrate_str != NULL) { + int baudrate = simple_strtoul(baudrate_str, NULL, 10); + + if (baudrate != gd->baudrate) { + gd->baudrate = baudrate; +#if defined(CONFIG_PPC) || defined(CONFIG_MCF52x2) + gd->bd->bi_baudrate = baudrate; +#endif + serial_setbrg(); + } + } +#endif } #ifdef CONFIG_AUTO_COMPLETE