diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-08 12:38:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-08 12:38:03 -0400 |
| commit | 7bc0be96f79344d7b103dd64c31be0574f7b39e9 (patch) | |
| tree | 33251d05271c64614671b46ab1bb5522535a4594 /common | |
| parent | ea92f95d630cba9c3a324d250258ad2e35d9c997 (diff) | |
| parent | 5004901efb3b47f7fb22b29cdd127245d3814fd2 (diff) | |
| download | u-boot-7bc0be96f79344d7b103dd64c31be0574f7b39e9.zip u-boot-7bc0be96f79344d7b103dd64c31be0574f7b39e9.tar.gz u-boot-7bc0be96f79344d7b103dd64c31be0574f7b39e9.tar.bz2 | |
Merge branch '2022-07-08-assorted-updates' into next
- Assorted bugfixes and improvements
Diffstat (limited to 'common')
| -rw-r--r-- | common/init/board_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c index eab5ee1..6a55026 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -78,9 +78,11 @@ __weak void board_init_f_init_stack_protection(void) ulong board_init_f_alloc_reserve(ulong top) { /* Reserve early malloc arena */ +#ifndef CONFIG_MALLOC_F_ADDR #if CONFIG_VAL(SYS_MALLOC_F_LEN) top -= CONFIG_VAL(SYS_MALLOC_F_LEN); #endif +#endif /* LAST : reserve GD (rounded up to a multiple of 16 bytes) */ top = rounddown(top-sizeof(struct global_data), 16); |