[PATCH u-boot-marvell v3 14/39] tools: kwboot: Print new line after SPL output
Stefan Roese
sr at denx.de
Fri Oct 1 08:20:06 CEST 2021
On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun at nic.cz>
>
> 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 at nic.cz>
Reviewed-by: Stefan Roese <sr at denx.de>
Thanks,
Stefan
> ---
> tools/kwboot.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 4636622a6c..2f4c61bed6 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -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) {
>
Viele Grüße,
Stefan
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
More information about the U-Boot
mailing list