Skip to contentSkip to conversation

tools: kwboot: Clean up usage text

PATCH New Kevin Smith 2 participants 4 messages Feb 16, 2016 – Mar 24, 2016

lore
Share & tools
lore

Kevin Smith

author
#0 lore raw

PATCH 1/2 tools: kwboot: Clean up usage text

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 <[email protected]>
Cc Stefan Roese <[email protected]>
---
 tools/kwboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/kwboot.c +1 -1
index c5f4492..6d1f66e 100644
@@ -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,
Signature · 1 line
2.4.6
author
#1 lore raw

PATCH 2/2 tools: kwboot: Add xmodem timeout option

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 <[email protected]>
Cc Stefan Roese <[email protected]>
---
 tools/kwboot.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tools/kwboot.c +9 -2
index 6d1f66e..2bd56eb 100644
@@ -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)
Signature · 1 line
2.4.6
#2 lore raw

PATCH 2/2 tools: kwboot: Add xmodem timeout option

Quoted 8 lines · 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 <[email protected]>
Cc Stefan Roese <[email protected]>

Applied to u-boot-marvell/master.

Thanks,
Stefan

#3 lore raw

PATCH 1/2 tools: kwboot: Clean up usage text

In reply to Kevin Smith
Quoted 7 lines · 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 <[email protected]>
Cc Stefan Roese <[email protected]>

Applied to u-boot-marvell/master.

Thanks,
Stefan