diff options
| author | Tom Rini <[email protected]> | 2023-10-06 17:23:47 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-06 17:23:47 -0400 |
| commit | 83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch) | |
| tree | fcabaf4a86164f385ede03b654bc69cbffb2a3ee /common/init | |
| parent | be2abe73df58a35da9e8d5afb13fccdf1b0faa8e (diff) | |
| parent | f69d3d6d10b15872a279aeb10b7c522627aff6c2 (diff) | |
Merge branch '2023-10-06-spl-prepare-for-universal-payload'
To quote the author:
This series tidies up SPL a little and adds some core ofnode functions
needed to support Universal Payload. It also includes a few minor
fix-ups for sandbox.
For SPL the changes include CONFIG naming, removing various #ifdefs and
tidying up the FIT code.
One notable piece of the ofnode improvements is support for flattening a
livetree. This should be useful in future as we move FDT fixups to use
the ofnode API.
Diffstat (limited to 'common/init')
| -rw-r--r-- | common/init/board_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c index ab8c508ad83..ed2365daa35 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -79,7 +79,7 @@ ulong board_init_f_alloc_reserve(ulong top) { /* Reserve early malloc arena */ #ifndef CFG_MALLOC_F_ADDR -#if CONFIG_VAL(SYS_MALLOC_F_LEN) +#if CONFIG_IS_ENABLED(SYS_MALLOC_F) top -= CONFIG_VAL(SYS_MALLOC_F_LEN); #endif #endif @@ -159,7 +159,7 @@ void board_init_f_init_reserve(ulong base) * Use gd as it is now properly set for all architectures. */ -#if CONFIG_VAL(SYS_MALLOC_F_LEN) +#if CONFIG_IS_ENABLED(SYS_MALLOC_F) /* go down one 'early malloc arena' */ gd->malloc_base = base; #if CONFIG_IS_ENABLED(ZERO_MEM_BEFORE_USE) |