colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: kwboot: Print new line after SPL output

Browse Source 
There is no separation between output from the code from binary header
(U-Boot SPL in most cases) and subsequent kwboot output.

Print '\n' to make distinguishing these two easier.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Behún
2021-09-24 23:06:51 +02:00
committed by Stefan Roese
parent 48b3ea66ca
commit 2e81b3ab0e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/kwboot.c
View File

@@ -382,10 +382,12 @@ _is_xm_reply(char c)
}
static int
kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
{
int rc;
*non_xm_print = 0;
while (1) {
rc = kwboot_tty_recv(fd, c, 1, blk_rsp_timeo);
if (rc) {
@@ -405,6 +407,7 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
if (allow_non_xm) {
putchar(*c);
fflush(stdout);
*non_xm_print = 1;
}
}
@@ -415,6 +418,7 @@ static int
kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
int *done_print)
{
int non_xm_print;
int rc, retries;
char c;
@@ -432,7 +436,7 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
*done_print = 1;
}
rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm);
rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm, &non_xm_print);
if (rc)
return rc;
@@ -440,6 +444,9 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
kwboot_progress(-1, '+');
} while (c == NAK && retries-- > 0);
if (non_xm_print)
kwboot_printv("\n");
rc = -1;
switch (c) {