diff options
| author | Simon Glass <sjg@chromium.org> | 2012-11-30 13:01:16 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-10 22:21:44 +0100 |
| commit | eae78c3406e8b53950ab716567157aa836a5f398 (patch) | |
| tree | 36dc2a552bd9b8e3af4b99fe8e62276318c920ec /arch/arm/lib/board.c | |
| parent | 724cdffca179057f4ebdf413ad764ea70b0e8ed2 (diff) | |
| download | olio-uboot-2014.01-eae78c3406e8b53950ab716567157aa836a5f398.tar.xz olio-uboot-2014.01-eae78c3406e8b53950ab716567157aa836a5f398.zip | |
arm: Move fdt check earlier so that board_early_init_f() can use it
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>
Diffstat (limited to 'arch/arm/lib/board.c')
| -rw-r--r-- | 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 c214bba88..864b53380 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, |