We want to use the fdt inside board_early_init_f(), so check for its presence earlier in the pre-reloc init sequence.
So far ARM and microblaze are the only only ones that use CONFIG_OF_CONTROL. Microblaze does not have the same init loop, and in particular does not have the board_early_init_f() call. So a patch for microblaze would have no meaning.
Signed-off-by: Simon Glass sjg@chromium.org --- Changes in v2: - Update commit message with more detail
arch/arm/lib/board.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index e03fc6d..262a3ca 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -233,13 +233,12 @@ int power_init_board(void)
init_fnc_t *init_sequence[] = { arch_cpu_init, /* basic arch cpu dependent setup */ - -#if defined(CONFIG_BOARD_EARLY_INIT_F) - board_early_init_f, -#endif #ifdef CONFIG_OF_CONTROL fdtdec_check_fdt, #endif +#if defined(CONFIG_BOARD_EARLY_INIT_F) + board_early_init_f, +#endif timer_init, /* initialize timer */ #ifdef CONFIG_BOARD_POSTCLK_INIT board_postclk_init,