From: Quentin Schulz Date: Thu, 6 Jun 2024 11:44:04 +0000 (+0200) Subject: rockchip: mkimage: fix mkimage -l for header v1 X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=3f9a19befe9277db2a337552912c6ddbcc0c8b10;p=u-boot.git rockchip: mkimage: fix mkimage -l for header v1 There are two paths to reach this function, either through mkimage -l or through dumpimage -l. The latter passes a NULL imagename while the former passes an empty string. Therefore, let's make both tools behave the same by handling the empty string the same way as for NULL. Without this, the only way to get some information out of mkimage -l is to provide "-n rk3399" for example, which isn't documented in the usage of the tool. Signed-off-by: Quentin Schulz Reviewed-by: Kever Yang --- diff --git a/tools/rkcommon.c b/tools/rkcommon.c index 12c27b34ea..3e52236b15 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -470,7 +470,7 @@ int rkcommon_verify_header(unsigned char *buf, int size, * If no 'imagename' is specified via the commandline (e.g. if this is * 'dumpimage -l' w/o any further constraints), we accept any spl_info. */ - if (params->imagename == NULL) + if (params->imagename == NULL || !strlen(params->imagename)) return 0; /* Match the 'imagename' against the 'spl_hdr' found */