]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
tools: kwboot: Make kwboot more robust on a38x
authorJon Nettleton <jon@solid-run.com>
Mon, 13 Aug 2018 15:24:38 +0000 (18:24 +0300)
committerStefan Roese <sr@denx.de>
Wed, 19 Sep 2018 06:59:26 +0000 (08:59 +0200)
This patch accomplishes 2 things to make the kwboot procedure
on the a38x more reliable.

1)  We fill the tty with 1K of the magic bootparam.  This helps
with the timing of where the microcode picks up in the read of
the line to ensure we actually catch the break to go into recovery
mode

2)  Before starting the xmodem transfer we sleep for 2 seconds
and then flush the line.  This allows all the magic bootparam
to be flushed from the line and makes the xmodem transfer reliable
and removes the Bad message failures.

Signed-off-by: Jon Nettleton <jon@solid-run.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
tools/kwboot.c

index 50ae2b4b77b1e3702b92f884979bc7808893e479..4be094c9c8d81ebca06170a386718527880a587e 100644 (file)
@@ -286,6 +286,7 @@ kwboot_bootmsg(int tty, void *msg)
 {
        int rc;
        char c;
+       int count;
 
        if (msg == NULL)
                kwboot_printv("Please reboot the target into UART boot mode...");
@@ -297,10 +298,12 @@ kwboot_bootmsg(int tty, void *msg)
                if (rc)
                        break;
 
-               rc = kwboot_tty_send(tty, msg, 8);
-               if (rc) {
-                       usleep(msg_req_delay * 1000);
-                       continue;
+               for (count = 0; count < 128; count++) {
+                       rc = kwboot_tty_send(tty, msg, 8);
+                       if (rc) {
+                               usleep(msg_req_delay * 1000);
+                               continue;
+                       }
                }
 
                rc = kwboot_tty_recv(tty, &c, 1, msg_rsp_timeo);
@@ -426,6 +429,9 @@ kwboot_xmodem(int tty, const void *_data, size_t size)
 
        kwboot_printv("Sending boot image...\n");
 
+       sleep(2); /* flush isn't effective without it */
+       tcflush(tty, TCIOFLUSH);
+
        do {
                struct kwboot_block block;
                int n;