summaryrefslogtreecommitdiff
path: root/tools/kwboot.c
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2018-07-03 12:10:30 -0400
committerStefan Roese <sr@denx.de>2018-08-07 10:53:52 +0200
commit3475a71d4e7696865ebc710e56621b04d56a621e (patch)
tree9c9c3fb2734abbf631f39431df37ecc33ffe6353 /tools/kwboot.c
parenta6477f7cbc56126d7a946115fb06bfed6b3565ba (diff)
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>
Diffstat (limited to 'tools/kwboot.c')
-rw-r--r--tools/kwboot.c2
1 files changed, 1 insertions, 1 deletions
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");