diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-17 10:38:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-17 10:38:28 -0400 |
| commit | 13aa090b87a0fbdfe690011669b9fdb96bb1ccc7 (patch) | |
| tree | 69af16bc8ecc4b6e8106a750e31e51d7ec078828 /common/board_r.c | |
| parent | aa817dfcaf158dda71358d02181bf52c30dbe4c6 (diff) | |
| parent | b8956425d525c3c25fd218f252f89a5e44df6a9f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- bootstd: Add a bootmeth for ChromiumOS on x86
- x86: Use qemu-x86_64 to boot EFI installers
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c index d798c00a80a..4aaa8940311 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -196,7 +196,7 @@ static int initr_barrier(void) static int initr_malloc(void) { - ulong malloc_start; + ulong start; #if CONFIG_VAL(SYS_MALLOC_F_LEN) debug("Pre-reloc malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr, @@ -207,8 +207,9 @@ static int initr_malloc(void) * This value MUST match the value of gd->start_addr_sp in board_f.c: * reserve_noncached(). */ - malloc_start = gd->relocaddr - TOTAL_MALLOC_LEN; - mem_malloc_init((ulong)map_sysmem(malloc_start, TOTAL_MALLOC_LEN), + start = gd->relocaddr - TOTAL_MALLOC_LEN; + gd_set_malloc_start(start); + mem_malloc_init((ulong)map_sysmem(start, TOTAL_MALLOC_LEN), TOTAL_MALLOC_LEN); return 0; } |