[PATCH] Improve user feedback in case of FPGA bitstream load failure

[vtpieter at gmail.com]

From: Pieter Van Trappen <pieter.van.trappen at cern.ch>

In fpga.c, change debug() calls to puts() for important user
feedback. In zynqpl.c, change 'up to' to 'above' which corrects this
confusing or wrong statement.

Signed-off-by: Pieter Van Trappen <pieter.van.trappen at cern.ch>
---
 cmd/fpga.c            | 20 ++++++++++----------
 drivers/fpga/zynqpl.c |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmd/fpga.c b/cmd/fpga.c
index 9dc7b63db5d..2c2a63524de 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -43,7 +43,7 @@ static int do_fpga_check_params(long *dev, long *fpga_data, size_t *data_size,
 	debug("%s %d, %d\n", __func__, argc, cmdtp->maxargs);
 
 	if (argc != cmdtp->maxargs) {
-		debug("fpga: incorrect parameters passed\n");
+		puts("fpga: incorrect parameters passed\n");
 		return CMD_RET_USAGE;
 	}
 
@@ -51,14 +51,14 @@ static int do_fpga_check_params(long *dev, long *fpga_data, size_t *data_size,
 
 	local_fpga_data = simple_strtol(argv[1], NULL, 16);
 	if (!local_fpga_data) {
-		debug("fpga: zero fpga_data address\n");
+		puts("fpga: zero fpga_data address\n");
 		return CMD_RET_USAGE;
 	}
 	*fpga_data = local_fpga_data;
 
 	local_data_size = hextoul(argv[2], NULL);
 	if (!local_data_size) {
-		debug("fpga: zero size\n");
+		puts("fpga: zero size\n");
 		return CMD_RET_USAGE;
 	}
 	*data_size = local_data_size;
@@ -78,7 +78,7 @@ static int do_fpga_loads(struct cmd_tbl *cmdtp, int flag, int argc,
 	memset(&fpga_sec_info, 0, sizeof(fpga_sec_info));
 
 	if (argc < 5) {
-		debug("fpga: incorrect parameters passed\n");
+		puts("fpga: incorrect parameters passed\n");
 		return CMD_RET_USAGE;
 	}
 
@@ -100,13 +100,13 @@ static int do_fpga_loads(struct cmd_tbl *cmdtp, int flag, int argc,
 
 	if (fpga_sec_info.authflag >= FPGA_NO_ENC_OR_NO_AUTH &&
 	    fpga_sec_info.encflag >= FPGA_NO_ENC_OR_NO_AUTH) {
-		debug("fpga: Use <fpga load> for NonSecure bitstream\n");
+		puts("fpga: Use <fpga load> for NonSecure bitstream\n");
 		return CMD_RET_USAGE;
 	}
 
 	if (fpga_sec_info.encflag == FPGA_ENC_USR_KEY &&
 	    !fpga_sec_info.userkey_addr) {
-		debug("fpga: User key not provided\n");
+		puts("fpga: User key not provided\n");
 		return CMD_RET_USAGE;
 	}
 
@@ -248,12 +248,12 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 	debug("fpga: argc %x, dev %lx, datastr %s\n", argc, dev, datastr);
 
 	if (dev == FPGA_INVALID_DEVICE) {
-		debug("fpga: Invalid fpga device\n");
+		puts("fpga: Invalid fpga device\n");
 		return CMD_RET_USAGE;
 	}
 
 	if (argc == 0 && !datastr) {
-		debug("fpga: No datastr passed\n");
+		puts("fpga: No datastr passed\n");
 		return CMD_RET_USAGE;
 	}
 
@@ -390,7 +390,7 @@ static int do_fpga_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
 	fpga_cmd = find_cmd_tbl(argv[1], fpga_commands,
 				ARRAY_SIZE(fpga_commands));
 	if (!fpga_cmd) {
-		debug("fpga: non existing command\n");
+		puts("fpga: non existing command\n");
 		return CMD_RET_USAGE;
 	}
 
@@ -398,7 +398,7 @@ static int do_fpga_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
 	argv += 2;
 
 	if (argc > fpga_cmd->maxargs) {
-		debug("fpga: more parameters passed\n");
+		puts("fpga: more parameters passed\n");
 		return CMD_RET_USAGE;
 	}
 
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index 3e86d854a01..7495ac2a69a 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -360,7 +360,7 @@ static int zynq_validate_bitstream(xilinx_desc *desc, const void *buf,
 	}
 
 	if ((u32)buf < SZ_1M) {
-		printf("%s: Bitstream has to be placed up to 1MB (%x)\n",
+		printf("%s: Bitstream has to be placed above 1MB (%x)\n",
 		       __func__, (u32)buf);
 		return FPGA_FAIL;
 	}

base-commit: 62d24441e0a29c828fda6fbda3b10710ce714094
-- 
2.48.1