Revert "Merge patch series "pxe: Allow extlinux booting without CMDLINE enabled""

[thirdparty/u-boot.git] / cmd / blob.c

diff --git a/cmd/blob.c b/cmd/blob.c
index 887219cc079235b7136e35abcd7161152da7d6d3..7c77c410d5284e87d86e4227f4ac42a34241889d 100644 (file)
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -70,10 +70,10 @@ static int do_blob(struct cmd_tbl *cmdtp, int flag, int argc,
        else
                return CMD_RET_USAGE;
 
-       src_addr = simple_strtoul(argv[2], NULL, 16);
-       dst_addr = simple_strtoul(argv[3], NULL, 16);
-       len = simple_strtoul(argv[4], NULL, 16);
-       key_addr = simple_strtoul(argv[5], NULL, 16);
+       src_addr = hextoul(argv[2], NULL);
+       dst_addr = hextoul(argv[3], NULL);
+       len = hextoul(argv[4], NULL);
+       key_addr = hextoul(argv[5], NULL);
 
        km_ptr = (uint8_t *)(uintptr_t)key_addr;
        src_ptr = (uint8_t *)(uintptr_t)src_addr;
@@ -84,7 +84,7 @@ static int do_blob(struct cmd_tbl *cmdtp, int flag, int argc,
 
        hab_caam_clock_enable(1);
 
-       u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR +
+       u32 out_jr_size = sec_in32(CFG_SYS_FSL_JR0_ADDR +
                                   FSL_CAAM_ORSR_JRa_OFFSET);
        if (out_jr_size != FSL_CAAM_MAX_JR_SIZE)
                sec_init();