diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-02 13:32:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-02 13:32:20 -0400 |
| commit | 51aef405550e603ff702c034f0e2cd0f15bdf2bb (patch) | |
| tree | 15216d11d6890cd497b6a97176c7aad4c4d63ecf /arch/mips/mach-octeon/bootoctlinux.c | |
| parent | 73994c452fc5a960114360a651201ac48b135e81 (diff) | |
| parent | e6951139c0544116330b12e287fe45e30bbab11c (diff) | |
Merge branch '2021-08-02-numeric-input-cleanups'
- Merge in a series that cleans up and makes more consistent how we deal
with numeric input on the CLI. This saves a few bytes in a lot of
places.
Diffstat (limited to 'arch/mips/mach-octeon/bootoctlinux.c')
| -rw-r--r-- | arch/mips/mach-octeon/bootoctlinux.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/mach-octeon/bootoctlinux.c b/arch/mips/mach-octeon/bootoctlinux.c index c195dc28ad7..349da08da6d 100644 --- a/arch/mips/mach-octeon/bootoctlinux.c +++ b/arch/mips/mach-octeon/bootoctlinux.c @@ -281,8 +281,7 @@ int octeon_parse_bootopts(int argc, char *const argv[], } else if (!strncmp(argv[arg], "forceboot", 9)) { boot_args->forceboot = true; } else if (!strncmp(argv[arg], "nodemask=", 9)) { - boot_args->node_mask = simple_strtoul(argv[arg] + 9, - NULL, 16); + boot_args->node_mask = hextoul(argv[arg] + 9, NULL); } else if (!strncmp(argv[arg], "numcores=", 9)) { memset(node_values, 0, sizeof(node_values)); num_values = octeon_parse_nodes(node_values, @@ -383,7 +382,7 @@ int do_bootoctlinux(struct cmd_tbl *cmdtp, int flag, int argc, argv[1][1] == 'x' || argv[1][1] == 'X' || argv[1][1] == '\0'))) { - addr = simple_strtoul(argv[1], NULL, 16); + addr = hextoul(argv[1], NULL); if (!addr) addr = CONFIG_SYS_LOAD_ADDR; arg_start++; |