diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
| commit | 83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch) | |
| tree | fcabaf4a86164f385ede03b654bc69cbffb2a3ee /common/board_f.c | |
| 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/board_f.c')
| -rw-r--r-- | common/board_f.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c index aef395b135..d4d7d01f8f 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -794,7 +794,7 @@ static int initf_bootstage(void) static int initf_dm(void) { -#if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN) +#if defined(CONFIG_DM) && CONFIG_IS_ENABLED(SYS_MALLOC_F) int ret; bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f"); @@ -841,9 +841,7 @@ static const init_fnc_t init_sequence_f[] = { log_init, initf_bootstage, /* uses its own timer, so does not need DM */ event_init, -#ifdef CONFIG_BLOBLIST - bloblist_init, -#endif + bloblist_maybe_init, setup_spl_handoff, #if defined(CONFIG_CONSOLE_RECORD_INIT_F) console_record_init, |