From patchwork Thu Jul 3 22:02:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Perkov X-Patchwork-Id: 366998 X-Patchwork-Delegate: sr@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 6AFE61400D5 for ; Fri, 4 Jul 2014 08:03:14 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D2D5D4A02E; Fri, 4 Jul 2014 00:03:10 +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 1DG+dPRS61Bq; Fri, 4 Jul 2014 00:03:10 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 848B34A02F; Fri, 4 Jul 2014 00:03:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76C324A02E for ; Fri, 4 Jul 2014 00:03:03 +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 G4ZyixzT3Dtm for ; Fri, 4 Jul 2014 00:03:00 +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 arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) by theia.denx.de (Postfix) with ESMTPS id 9C2C24A040 for ; Fri, 4 Jul 2014 00:02:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8FCA5281103; Fri, 4 Jul 2014 00:00:53 +0200 (CEST) X-Virus-Scanned: at arrakis.dune.hu Received: from w500.lan (141-138-0-17.dhcp.iskon.hr [141.138.0.17]) by arrakis.dune.hu (Postfix) with ESMTPSA id 6DF6028087C; Fri, 4 Jul 2014 00:00:48 +0200 (CEST) Date: Fri, 4 Jul 2014 00:02:47 +0200 From: Luka Perkov To: Stefan Roese Message-ID: <20140703220246.GA8506@w500.lan> References: <1403862911-6138-1-git-send-email-sr@denx.de> <1403862911-6138-23-git-send-email-sr@denx.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1403862911-6138-23-git-send-email-sr@denx.de> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: trini@ti.com, u-boot@lists.denx.de Subject: Re: [U-Boot] [PATCH v1 22/25] tools/kwboot: Sync with latest barebox version to support Armada XP 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Hi Stefan, On Fri, Jun 27, 2014 at 11:55:08AM +0200, Stefan Roese wrote: > The barebox version of the kwboot tool has evolved a bit. To support > Armada XP and Dove. Additionally a few minor fixes have been applied. > So lets sync with the latest barebox version. > > Please note that the main difference between both versions now is, that > the U-Boot version still supports the -p option, to dynamically patch > an image for UART boot mode. I didn't test it now though. > > Signed-off-by: Stefan Roese > --- > > tools/kwboot.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 83 insertions(+), 14 deletions(-) ... > -#define KWBOOT_MSG_REQ_DELAY 10 /* ms */ > -#define KWBOOT_MSG_RSP_TIMEO 50 /* ms */ > +static unsigned char kwboot_msg_debug[] = { > + 0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 > +}; > + > +#define KWBOOT_MSG_REQ_DELAY 1000 /* ms */ > +#define KWBOOT_MSG_RSP_TIMEO 1000 /* ms */ This causes problems on kirkwood. The old values should be kept, apply the patch below to this one. After that chage feel free to add Tested-by line. Tested-by: Luka Perkov Now only to figure out why 21/25 breaks things on kirkwood. Luka diff --git a/tools/kwboot.c b/tools/kwboot.c index c47970e..ccc9d90 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -42,8 +42,8 @@ static unsigned char kwboot_msg_debug[] = { 0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; -#define KWBOOT_MSG_REQ_DELAY 1000 /* ms */ -#define KWBOOT_MSG_RSP_TIMEO 1000 /* ms */ +#define KWBOOT_MSG_REQ_DELAY 10 /* ms */ +#define KWBOOT_MSG_RSP_TIMEO 50 /* ms */ /* * Xmodem Transfers