Getting DTB/DTBO header address happens twice (in do_dtimg_dump and in dtimg_get_fdt) with duplicating below error messages: - Error: Wrong image address - Error: DT image header is incorrect
Reduce the duplication and improve the error message by appending the faulty address value: - Error: Wrong image address '0x48000000z'
Signed-off-by: Eugeniu Rosca erosca@de.adit-jv.com --- cmd/dtimg.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/cmd/dtimg.c b/cmd/dtimg.c index 2317c859953d..5989081b0c14 100644 --- a/cmd/dtimg.c +++ b/cmd/dtimg.c @@ -13,18 +13,13 @@ enum cmd_dtimg_info { CMD_DTIMG_SIZE, };
-static int do_dtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int dtimg_get_argv_addr(char * const str, ulong *hdr_addrp) { char *endp; - ulong hdr_addr; + ulong hdr_addr = simple_strtoul(str, &endp, 16);
- if (argc != 2) - return CMD_RET_USAGE; - - hdr_addr = simple_strtoul(argv[1], &endp, 16); if (*endp != '\0') { - printf("Error: Wrong image address\n"); + printf("Error: Wrong image address '%s'\n", str); return CMD_RET_FAILURE; }
@@ -32,6 +27,21 @@ static int do_dtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, printf("Error: DT image header is incorrect\n"); return CMD_RET_FAILURE; } + *hdr_addrp = hdr_addr; + + return CMD_RET_SUCCESS; +} + +static int do_dtimg_dump(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + ulong hdr_addr; + + if (argc != 2) + return CMD_RET_USAGE; + + if (dtimg_get_argv_addr(argv[1], &hdr_addr) != CMD_RET_SUCCESS) + return CMD_RET_FAILURE;
android_dt_print_contents(hdr_addr);
@@ -50,16 +60,8 @@ static int dtimg_get_fdt(int argc, char * const argv[], enum cmd_dtimg_info cmd) if (argc != 4) return CMD_RET_USAGE;
- hdr_addr = simple_strtoul(argv[1], &endp, 16); - if (*endp != '\0') { - printf("Error: Wrong image address\n"); + if (dtimg_get_argv_addr(argv[1], &hdr_addr) != CMD_RET_SUCCESS) return CMD_RET_FAILURE; - } - - if (!android_dt_check_header(hdr_addr)) { - printf("Error: DT image header is incorrect\n"); - return CMD_RET_FAILURE; - }
index = simple_strtoul(argv[2], &endp, 0); if (*endp != '\0') {