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

tools: kwboot: Cleanup bootmsg and debugmsg variables

Browse Source 
Function kwboot_debugmsg() is always called with kwboot_msg_debug as msg
and function kwboot_bootmsg() with kwboot_msg_debug as msg. Function
kwboot_bootmsg() is never called with NULL msg.

Simplify, cleanup and remove dead code.

No functional change.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pali Rohár
2022-03-02 11:49:20 +01:00
committed by Stefan Roese
parent 132016e270
commit c1d911f15f
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/kwboot.c
View File

@@ -718,17 +718,14 @@ out:
} }
static int static int
kwboot_bootmsg(int tty, void *msg) kwboot_bootmsg(int tty)
{ {
struct kwboot_block block; struct kwboot_block block;
int rc; int rc;
char c; char c;
int count; int count;
if (msg == NULL) kwboot_printv("Sending boot message. Please reboot the target...");
kwboot_printv("Please reboot the target into UART boot mode...");
else
kwboot_printv("Sending boot message. Please reboot the target...");
do { do {
rc = tcflush(tty, TCIOFLUSH); rc = tcflush(tty, TCIOFLUSH);
@@ -736,7 +733,7 @@ kwboot_bootmsg(int tty, void *msg)
break; break;
for (count = 0; count < 128; count++) { for (count = 0; count < 128; count++) {
rc = kwboot_tty_send(tty, msg, 8, 0); rc = kwboot_tty_send(tty, kwboot_msg_boot, sizeof(kwboot_msg_boot), 0);
if (rc) if (rc)
break; break;
} }
@@ -798,7 +795,7 @@ kwboot_bootmsg(int tty, void *msg)
} }
static int static int
kwboot_debugmsg(int tty, void *msg) kwboot_debugmsg(int tty)
{ {
int rc; int rc;
@@ -811,7 +808,7 @@ kwboot_debugmsg(int tty, void *msg)
if (rc) if (rc)
break; break;
rc = kwboot_tty_send(tty, msg, 8, 0); rc = kwboot_tty_send(tty, kwboot_msg_debug, sizeof(kwboot_msg_debug), 0);
if (rc) if (rc)
break; break;
@@ -1737,8 +1734,8 @@ main(int argc, char **argv)
{ {
const char *ttypath, *imgpath; const char *ttypath, *imgpath;
int rv, rc, tty, term; int rv, rc, tty, term;
void *bootmsg; int bootmsg;
void *debugmsg; int debugmsg;
void *img; void *img;
size_t size; size_t size;
size_t after_img_rsv; size_t after_img_rsv;
@@ -1748,8 +1745,8 @@ main(int argc, char **argv)
rv = 1; rv = 1;
tty = -1; tty = -1;
bootmsg = NULL; bootmsg = 0;
debugmsg = NULL; debugmsg = 0;
imgpath = NULL; imgpath = NULL;
img = NULL; img = NULL;
term = 0; term = 0;
@@ -1771,7 +1768,7 @@ main(int argc, char **argv)
case 'b': case 'b':
if (imgpath || bootmsg || debugmsg) if (imgpath || bootmsg || debugmsg)
goto usage; goto usage;
bootmsg = kwboot_msg_boot; bootmsg = 1;
if (prev_optind == optind) if (prev_optind == optind)
goto usage; goto usage;
if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-') if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
@@ -1781,14 +1778,14 @@ main(int argc, char **argv)
case 'D': case 'D':
if (imgpath || bootmsg || debugmsg) if (imgpath || bootmsg || debugmsg)
goto usage; goto usage;
bootmsg = NULL; bootmsg = 0;
imgpath = optarg; imgpath = optarg;
break; break;
case 'd': case 'd':
if (imgpath || bootmsg || debugmsg) if (imgpath || bootmsg || debugmsg)
goto usage; goto usage;
debugmsg = kwboot_msg_debug; debugmsg = 1;
break; break;
case 'p': case 'p':
@@ -1869,13 +1866,13 @@ main(int argc, char **argv)
} }
if (debugmsg) { if (debugmsg) {
rc = kwboot_debugmsg(tty, debugmsg); rc = kwboot_debugmsg(tty);
if (rc) { if (rc) {
perror("debugmsg"); perror("debugmsg");
goto out; goto out;
} }
} else if (bootmsg) { } else if (bootmsg) {
rc = kwboot_bootmsg(tty, bootmsg); rc = kwboot_bootmsg(tty);
if (rc) { if (rc) {
perror("bootmsg"); perror("bootmsg");
goto out; goto out;