Merge https://source.denx.de/u-boot/custodians/u-boot-spi

[platform/kernel/u-boot.git] / cmd / cbfs.c

diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 8e91d4b..8a61f2c 100644 (file)
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -22,14 +22,13 @@ static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
                return 0;
        }
        if (argc == 2) {
-               end_of_rom = simple_strtoul(argv[1], &ep, 16);
+               end_of_rom = hextoul(argv[1], &ep);
                if (*ep) {
                        puts("\n** Invalid end of ROM **\n");
                        return 1;
                }
        }
-       file_cbfs_init(end_of_rom);
-       if (cbfs_get_result() != CBFS_SUCCESS) {
+       if (file_cbfs_init(end_of_rom)) {
                printf("%s.\n", file_cbfs_error());
                return 1;
        }
@@ -59,9 +58,9 @@ static int do_cbfs_fsload(struct cmd_tbl *cmdtp, int flag, int argc,
        }
 
        /* parse offset and count */
-       offset = simple_strtoul(argv[1], NULL, 16);
+       offset = hextoul(argv[1], NULL);
        if (argc == 4)
-               count = simple_strtoul(argv[3], NULL, 16);
+               count = hextoul(argv[3], NULL);
        else
                count = 0;