[U-Boot] [PATCH 1/2] tools: kwboot: Clean up usage text

[U-Boot] [PATCH 1/2] tools: kwboot: Clean up usage text

[Kevin Smith]

Usage text was getting unwieldy and somewhat incorrect.  The
usage summary implied that some options were mutually exclusive
(e.g. -q or -s).  Clean up the summary to just include the
important ones, and include a generic "[OPTIONS]" instead.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Cc: Stefan Roese <sr@denx.de>
---
 tools/kwboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index c5f4492..6d1f66e 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -674,7 +674,7 @@ static void
 kwboot_usage(FILE *stream, char *progname)
 {
 	fprintf(stream,
-		"Usage: %s [-d | -a | -q <req-delay> | -s <resp-timeo> | -b <image> | -D <image> ] [ -t ] [-B <baud> ] <TTY>\n",
+		"Usage: %s [OPTIONS] [-b <image> | -D <image> ] [-B <baud> ] <TTY>\n",
 		progname);
 	fprintf(stream, "\n");
 	fprintf(stream,
-- 
2.4.6

[U-Boot] [PATCH 2/2] tools: kwboot: Add xmodem timeout option

[Kevin Smith]

Add command-line specification of xmodem timeout.  If the binary
header needs to take a while to do something (e.g. DDR ECC
scrubbing), the xmodem transfer can time out.  Add a configurable
xmodem block timeout to allow transfers with slow binary headers
to succeed.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Cc: Stefan Roese <sr@denx.de>
---
 tools/kwboot.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 6d1f66e..2bd56eb 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -74,6 +74,7 @@ static int kwboot_verbose;
 
 static int msg_req_delay = KWBOOT_MSG_REQ_DELAY;
 static int msg_rsp_timeo = KWBOOT_MSG_RSP_TIMEO;
+static int blk_rsp_timeo = KWBOOT_BLK_RSP_TIMEO;
 
 static void
 kwboot_printv(const char *fmt, ...)
@@ -378,7 +379,7 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
 			break;
 
 		do {
-			rc = kwboot_tty_recv(fd, &c, 1, KWBOOT_BLK_RSP_TIMEO);
+			rc = kwboot_tty_recv(fd, &c, 1, blk_rsp_timeo);
 			if (rc)
 				break;
 
@@ -686,6 +687,8 @@ kwboot_usage(FILE *stream, char *progname)
 	fprintf(stream, "  -a: use timings for Armada XP\n");
 	fprintf(stream, "  -q <req-delay>:  use specific request-delay\n");
 	fprintf(stream, "  -s <resp-timeo>: use specific response-timeout\n");
+	fprintf(stream,
+		"  -o <block-timeo>: use specific xmodem block timeout\n");
 	fprintf(stream, "\n");
 	fprintf(stream, "  -t: mini terminal\n");
 	fprintf(stream, "\n");
@@ -718,7 +721,7 @@ main(int argc, char **argv)
 	kwboot_verbose = isatty(STDOUT_FILENO);
 
 	do {
-		int c = getopt(argc, argv, "hb:ptaB:dD:q:s:");
+		int c = getopt(argc, argv, "hb:ptaB:dD:q:s:o:");
 		if (c < 0)
 			break;
 
@@ -758,6 +761,10 @@ main(int argc, char **argv)
 			msg_rsp_timeo = atoi(optarg);
 			break;
 
+		case 'o':
+			blk_rsp_timeo = atoi(optarg);
+			break;
+
 		case 'B':
 			speed = kwboot_tty_speed(atoi(optarg));
 			if (speed == -1)
-- 
2.4.6

[U-Boot] [PATCH 2/2] tools: kwboot: Add xmodem timeout option

[Stefan Roese]

On 16.02.2016 22:28, Kevin Smith wrote:
> Add command-line specification of xmodem timeout.  If the binary
> header needs to take a while to do something (e.g. DDR ECC
> scrubbing), the xmodem transfer can time out.  Add a configurable
> xmodem block timeout to allow transfers with slow binary headers
> to succeed.
>
> Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
> Cc: Stefan Roese <sr@denx.de>

Applied to u-boot-marvell/master.

Thanks,
Stefan

[U-Boot] [PATCH 1/2] tools: kwboot: Clean up usage text

[Stefan Roese]

On 16.02.2016 22:28, Kevin Smith wrote:
> Usage text was getting unwieldy and somewhat incorrect.  The
> usage summary implied that some options were mutually exclusive
> (e.g. -q or -s).  Clean up the summary to just include the
> important ones, and include a generic "[OPTIONS]" instead.
>
> Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
> Cc: Stefan Roese <sr@denx.de>

Applied to u-boot-marvell/master.

Thanks,
Stefan