diff options
| author | Simon Glass <sjg@chromium.org> | 2020-02-03 07:36:05 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-02-05 19:33:46 -0700 |
| commit | 3ff6fe5fab11a99d4b3ec94a8a4a238d6f96f5ba (patch) | |
| tree | 1421254bdfe9e3484bfa99c0108081cf55f3fd88 /arch/sandbox/cpu/start.c | |
| parent | 1c8c47ec802af33acf02acb6c7b09e317c850711 (diff) | |
sandbox: Add a new header for the system malloc()
Some files use U-Boot headers but still need to access the system
malloc(). Allow this by creating a new asm/malloc.h which can be used so
long as U-Boot's malloc.h has not been included.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox/cpu/start.c')
| -rw-r--r-- | arch/sandbox/cpu/start.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 01adaebc61..4760731d72 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -8,10 +8,10 @@ #include <errno.h> #include <os.h> #include <cli.h> -#include <malloc.h> #include <sort.h> #include <asm/getopt.h> #include <asm/io.h> +#include <asm/malloc.h> #include <asm/sections.h> #include <asm/state.h> #include <linux/ctype.h> @@ -181,7 +181,7 @@ static int sandbox_cmdline_cb_default_fdt(struct sandbox_state *state, int len; len = strlen(state->argv[0]) + strlen(fmt) + 1; - fname = os_malloc(len); + fname = malloc(len); if (!fname) return -ENOMEM; snprintf(fname, len, fmt, state->argv[0]); @@ -201,7 +201,7 @@ static int sandbox_cmdline_cb_test_fdt(struct sandbox_state *state, int len; len = strlen(state->argv[0]) + strlen(fmt) + 1; - fname = os_malloc(len); + fname = malloc(len); if (!fname) return -ENOMEM; strcpy(fname, state->argv[0]); |