diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-06 07:25:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-06 07:25:04 -0500 |
| commit | e4dba4ba6f61e8128be0b4200ca2d8cebf62180b (patch) | |
| tree | 9f2877b1278093a579247756fdfd7fbe1055f63c /common/board_r.c | |
| parent | 6a026e5649f00c0b157a935279dfd625889db675 (diff) | |
| parent | b75ca06836567a467b8b5a9ee8ce0a8efde45e08 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Convert qemu-ppce500 to driver model and enable additional driver
support
- bug fixes/updates in net-dsa driver, vid driver, move configs to kconfig
- Update Maintainers of some powerpc, layerscape platforms
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c index 9793439adff..c835ff8e260 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -626,6 +626,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_DM initr_dm, #endif +#ifdef CONFIG_ADDR_MAP + initr_addr_map, +#endif #if defined(CONFIG_ARM) || defined(CONFIG_NDS32) || defined(CONFIG_RISCV) || \ defined(CONFIG_SANDBOX) board_init, /* Setup chipselects */ @@ -661,9 +664,6 @@ static init_fnc_t init_sequence_r[] = { initr_manual_reloc_cmdtable, #endif arch_initr_trap, -#ifdef CONFIG_ADDR_MAP - initr_addr_map, -#endif #if defined(CONFIG_BOARD_EARLY_INIT_R) board_early_init_r, #endif |