From: Willy Tarreau <w@1wt.eu>
Date: Tue, 3 Jul 2018 16:10:30 +0000 (-0400)
Subject: tools: kwboot: unbreak terminal-only mode
X-Git-Tag: v2018.09-rc2~66^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3475a71d4e7696865ebc710e56621b04d56a621e;p=oweals%2Fu-boot.git

tools: kwboot: unbreak terminal-only mode

Commit 84899e2 ("tools/kwboot: Sync with latest barebox version to
support Armada XP") accidently broke the terminal-only mode (-t) by
removing the test on the bootmsg. Thus even when trying to use kwboot
as a plain terminal, it asks to reboot the target.

This commit simply reintroduces the lost test so that it is possible
again to use kwboot to attach to the target system's console.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 8a421cda4e..0a77060288 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -821,7 +821,7 @@ main(int argc, char **argv)
 			perror("debugmsg");
 			goto out;
 		}
-	} else {
+	} else if (bootmsg) {
 		rc = kwboot_bootmsg(tty, bootmsg);
 		if (rc) {
 			perror("bootmsg");