[U-Boot] tools: kwboot: unbreak terminal-only mode

Tom Rini trini at konsulko.com
Tue Jul 3 16:10:30 UTC 2018


From: Willy Tarreau <w at 1wt.eu>

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 at 1wt.eu>
---
 tools/kwboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 8a421cd..0a77060 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");
-- 
1.7.12.1



More information about the U-Boot mailing list