summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-02-29 15:25:49 -0700
committerSimon Glass <sjg@chromium.org>2016-03-14 15:34:50 -0600
commita696d768c1274d667be86abe72869461b9fe0073 (patch)
treee69d3ab2def2dbae84f0cbd7fa0a63c9d4cd4108
parent3e8bd469504f5d5a8800a2ea46d664dde701105b (diff)
downloadu-boot-imx-a696d768c1274d667be86abe72869461b9fe0073.zip
u-boot-imx-a696d768c1274d667be86abe72869461b9fe0073.tar.gz
u-boot-imx-a696d768c1274d667be86abe72869461b9fe0073.tar.bz2
dm: cbfs: Fix handling of invalid type
The comment for file_cbfs_type() says that it returns 0 for an invalid type. The code appears to check for -1, except that it uses an unsigned variable to store the type. This results in a warning on 64-bit machines. Adjust it to make the meaning clearer. Continue to handle the -1 case since it may be needed. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--cmd/cbfs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 35d8a7a..779e9c0 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -103,7 +103,7 @@ int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
printf(" size type name\n");
printf("------------------------------------------\n");
while (file) {
- u32 type = file_cbfs_type(file);
+ int type = file_cbfs_type(file);
char *type_name = NULL;
const char *filename = file_cbfs_name(file);
@@ -140,7 +140,8 @@ int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
case CBFS_COMPONENT_CMOS_LAYOUT:
type_name = "cmos layout";
break;
- case -1UL:
+ case -1:
+ case 0:
type_name = "null";
break;
}