diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
| commit | 4a9146c29573dbfa661918280d9522a01f6ca919 (patch) | |
| tree | b1b135237dcfee94a27e8df7ce2208230c28b894 /arch/sandbox/cpu | |
| parent | f30924739975b4f60c0862b539790fdcdb7da20c (diff) | |
| parent | 6c3fc50ee59366df62e8345ea9fd86c3ace0c3f1 (diff) | |
Merge tag 'dm-pull-10jul20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata: better phandle and compatible-string support
patman support for Python3 on Ubuntu 14.04
new checkpatch check to avoid #ifdefs
Diffstat (limited to 'arch/sandbox/cpu')
| -rw-r--r-- | arch/sandbox/cpu/state.c | 5 | ||||
| -rw-r--r-- | arch/sandbox/cpu/u-boot-spl.lds | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index 1f794123b3..34b6fff7e7 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -378,7 +378,10 @@ int state_init(void) state->ram_size = CONFIG_SYS_SDRAM_SIZE; state->ram_buf = os_malloc(state->ram_size); - assert(state->ram_buf); + if (!state->ram_buf) { + printf("Out of memory\n"); + os_exit(1); + } state_reset_for_test(state); /* diff --git a/arch/sandbox/cpu/u-boot-spl.lds b/arch/sandbox/cpu/u-boot-spl.lds index de65b01b33..c60eb109b1 100644 --- a/arch/sandbox/cpu/u-boot-spl.lds +++ b/arch/sandbox/cpu/u-boot-spl.lds @@ -20,4 +20,4 @@ SECTIONS __bss_start = .; } -INSERT BEFORE .data; +INSERT AFTER .data; |