diff options
| -rw-r--r-- | common/cmd_load.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/common/cmd_load.c b/common/cmd_load.c index f6e522cbb..124819499 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -444,16 +444,20 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc, } if (load_baudrate != current_baudrate) { - printf("## Switch baudrate to %d bps and press ENTER ...\n", + printf("## Switch baudrate to %d bps.\n", load_baudrate); udelay(50000); gd->baudrate = load_baudrate; serial_setbrg(); udelay(50000); - for (;;) { - if (getc() == '\r') - break; - } +/* The commented out code was to wait to the user to press ENTER + * after setting to the new baudrate. This caused problems with automated flashing scripts. + * So disable this for now, and immediately continue at the new baudrate + * for (;;) { + * if (getc() == '\r') + * break; + * } +*/ } if (strcmp(argv[0],"loady")==0) { @@ -490,16 +494,21 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc, } } if (load_baudrate != current_baudrate) { - printf("## Switch baudrate to %d bps and press ESC ...\n", + printf("## Switch baudrate to %d bps.\n", current_baudrate); udelay(50000); gd->baudrate = current_baudrate; serial_setbrg(); udelay(50000); - for (;;) { - if (getc() == 0x1B) /* ESC */ - break; - } + +/* The commented out code was to wait to the user to press ESC + * after setting to the new baudrate. This caused problems with automated flashing scripts. + * So disable this for now, and immediately continue at the new baudrate + * for (;;) { + * if (getc() == 0x1B) // ESC + * break; + * } + */ } return rcode; |