diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-30 15:24:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-30 15:24:30 -0400 |
| commit | 63d4607e03e5f1f7ab9a18bc640e31f7d28874b4 (patch) | |
| tree | bdea1f28ad176fcd44f209bf943d25c8bddbe8d2 /common | |
| parent | 096912b5fe9bb2fd90599d86a714001df6924198 (diff) | |
| parent | 2424057b2ad0eacdd2d81e35e7bea5df97802b8f (diff) | |
Merge tag 'dm-pull-30oct20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata and dtoc improvements
sandbox SPL tests
binman support for compressed sections
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/common/board_r.c b/common/board_r.c index b9217b2e27..0829622d0d 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -296,20 +296,21 @@ static int initr_noncached(void) } #endif -#ifdef CONFIG_OF_LIVE static int initr_of_live(void) { - int ret; + if (CONFIG_IS_ENABLED(OF_LIVE)) { + int ret; - bootstage_start(BOOTSTAGE_ID_ACCUM_OF_LIVE, "of_live"); - ret = of_live_build(gd->fdt_blob, (struct device_node **)&gd->of_root); - bootstage_accum(BOOTSTAGE_ID_ACCUM_OF_LIVE); - if (ret) - return ret; + bootstage_start(BOOTSTAGE_ID_ACCUM_OF_LIVE, "of_live"); + ret = of_live_build(gd->fdt_blob, + (struct device_node **)gd_of_root_ptr()); + bootstage_accum(BOOTSTAGE_ID_ACCUM_OF_LIVE); + if (ret) + return ret; + } return 0; } -#endif #ifdef CONFIG_DM static int initr_dm(void) @@ -713,9 +714,7 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_SYS_NONCACHED_MEMORY initr_noncached, #endif -#ifdef CONFIG_OF_LIVE initr_of_live, -#endif #ifdef CONFIG_DM initr_dm, #endif |